treewide: resync translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
author: Jo-Philipp Wich <jo@mein.io> 2019-12-16 18:18:01 +0100
committer: Jo-Philipp Wich <jo@mein.io> 2019-12-16 18:18:01 +0100
commit: fc35802ff993102fafbf93694a6e1cb5c5447b02 (patch)
tree: 52c64795bcf93243a5294d6e7ef32e912f25289e
parent: bdcd08f4abc87d59acb5395be0ad466b3b609e11 (diff)
150 files changed, 8365 insertions, 7789 deletions
diff --git a/applications/luci-app-firewall/po/bg/firewall.po b/applications/luci-app-firewall/po/bg/firewall.po
index 4e2b2320c..417794137 100644
--- a/applications/luci-app-firewall/po/bg/firewall.po
+++ b/applications/luci-app-firewall/po/bg/firewall.po
@@ -125,7 +125,7 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgstr ""
 # Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr ""
 
@@ -300,7 +300,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr ""
 
@@ -453,7 +453,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/ca/firewall.po b/applications/luci-app-firewall/po/ca/firewall.po
index 2c147665e..3558ee419 100644
--- a/applications/luci-app-firewall/po/ca/firewall.po
+++ b/applications/luci-app-firewall/po/ca/firewall.po
@@ -130,7 +130,7 @@ msgstr "Xarxes cobertes"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Regles personalitzades"
 
@@ -241,7 +241,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Tallafocs"
 
@@ -305,7 +305,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Ajusts generals"
 
@@ -462,7 +462,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Reenviaments de port"
 
@@ -646,7 +646,7 @@ msgid "To %s, %s in %s"
 msgstr "A %s, %s en %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Regles de trànsit"
 
diff --git a/applications/luci-app-firewall/po/cs/firewall.po b/applications/luci-app-firewall/po/cs/firewall.po
index 07cdd7339..704a7905c 100644
--- a/applications/luci-app-firewall/po/cs/firewall.po
+++ b/applications/luci-app-firewall/po/cs/firewall.po
@@ -126,7 +126,7 @@ msgstr "Pokryté sítě"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Vlastní pravidla"
 
@@ -236,7 +236,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -300,7 +300,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Obecné nastavení"
 
@@ -457,7 +457,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Přesměrování portů"
 
@@ -478,7 +478,8 @@ msgstr "Protokol"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
-msgstr "Přesměrovat vybraný příchozí provoz na uvedený port vnitřního hostitele"
+msgstr ""
+"Přesměrovat vybraný příchozí provoz na uvedený port vnitřního hostitele"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
@@ -608,8 +609,8 @@ msgstr ""
 "Tato sekce definuje běžné možnosti %q. <em>Vstupní</em> a <em>výstupní</em> "
 "možnosti nastavují výchozí politiky pro provoz, vstupující do této zóny a "
 "vystupující z ní, zatímco <em>přesměrovací</em> možnosti popisují politiku "
-"pro přesměrování provozu mezi rozdílnými sítěmi uvnitř jedné zóny. <em>"
-"Pokryté sítě</em> určuje, které z dostupných sítí jsou členy této zóny."
+"pro přesměrování provozu mezi rozdílnými sítěmi uvnitř jedné zóny. "
+"<em>Pokryté sítě</em> určuje, které z dostupných sítí jsou členy této zóny."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
@@ -640,7 +641,7 @@ msgid "To %s, %s in %s"
 msgstr "Na %s, %s v %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Pravidla síťového provozu"
 
diff --git a/applications/luci-app-firewall/po/de/firewall.po b/applications/luci-app-firewall/po/de/firewall.po
index 2f9aba3f5..776bb8ba8 100644
--- a/applications/luci-app-firewall/po/de/firewall.po
+++ b/applications/luci-app-firewall/po/de/firewall.po
@@ -136,7 +136,7 @@ msgstr "Abgedeckte Netzwerke"
 msgid "Covered subnets"
 msgstr "Abgedeckte Subnetze"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Benutzerdefinierte Regeln"
 
@@ -251,7 +251,7 @@ msgstr "Zusätzliche iptables-Argumente"
 msgid "Extra source arguments"
 msgstr "Zusätzliche Quell-Argumente"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -315,7 +315,7 @@ msgstr "Von %s auf <var>dieses Gerät</var> mit Quelle %s und %s"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
@@ -480,7 +480,7 @@ msgstr ""
 "alle Dienste vollständig offengelegt werden."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Portweiterleitungen"
 
@@ -669,7 +669,7 @@ msgid "To %s, %s in %s"
 msgstr "Zu %s, %s in %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Traffic-Regeln"
 
diff --git a/applications/luci-app-firewall/po/el/firewall.po b/applications/luci-app-firewall/po/el/firewall.po
index d37baa6e6..8103329a1 100644
--- a/applications/luci-app-firewall/po/el/firewall.po
+++ b/applications/luci-app-firewall/po/el/firewall.po
@@ -128,7 +128,7 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Προσαρμοσμένοι Κανόνες"
 
@@ -236,7 +236,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Τείχος προστασίας"
 
@@ -300,7 +300,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Γενικές Ρυθμίσεις"
 
@@ -456,7 +456,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Προώθηση Θυρών"
 
@@ -628,7 +628,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/en/firewall.po b/applications/luci-app-firewall/po/en/firewall.po
index 56e8a0360..76aa96fb6 100644
--- a/applications/luci-app-firewall/po/en/firewall.po
+++ b/applications/luci-app-firewall/po/en/firewall.po
@@ -125,7 +125,7 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgstr ""
 # Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -300,7 +300,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr ""
 
@@ -455,7 +455,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr ""
 
@@ -655,7 +655,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po
index 255f8b909..295f9c7aa 100644
--- a/applications/luci-app-firewall/po/es/firewall.po
+++ b/applications/luci-app-firewall/po/es/firewall.po
@@ -137,7 +137,7 @@ msgstr "Redes cubiertas"
 msgid "Covered subnets"
 msgstr "Subredes cubiertas"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Reglas personalizadas"
 
@@ -253,7 +253,7 @@ msgstr "Argumentos adicionales de iptables"
 msgid "Extra source arguments"
 msgstr "Argumentos fuente adicionales"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -317,7 +317,7 @@ msgstr "De %s en <var>este dispositivo</var> con la fuente %s y %s"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Configuración general"
 
@@ -480,7 +480,7 @@ msgstr ""
 "servicios."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Reenvío de puertos"
 
@@ -668,7 +668,7 @@ msgid "To %s, %s in %s"
 msgstr "A %s, %s en %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Reglas de tráfico"
 
diff --git a/applications/luci-app-firewall/po/fr/firewall.po b/applications/luci-app-firewall/po/fr/firewall.po
index 72bdf2013..d3dba5b97 100644
--- a/applications/luci-app-firewall/po/fr/firewall.po
+++ b/applications/luci-app-firewall/po/fr/firewall.po
@@ -128,7 +128,7 @@ msgstr "Réseaux couverts"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Régles spécifiques"
 
@@ -239,7 +239,7 @@ msgstr ""
 #  applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua                    #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Pare-feu"
 
@@ -303,7 +303,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
@@ -460,7 +460,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Redirections de port"
 
@@ -681,7 +681,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Règles de trafic"
 
diff --git a/applications/luci-app-firewall/po/he/firewall.po b/applications/luci-app-firewall/po/he/firewall.po
index 179ab1624..de89c5e45 100644
--- a/applications/luci-app-firewall/po/he/firewall.po
+++ b/applications/luci-app-firewall/po/he/firewall.po
@@ -122,7 +122,7 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr ""
 
@@ -229,7 +229,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr ""
 
@@ -293,7 +293,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr ""
 
@@ -446,7 +446,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr ""
 
@@ -613,7 +613,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/hi/firewall.po b/applications/luci-app-firewall/po/hi/firewall.po
index 68fdf498b..339985674 100644
--- a/applications/luci-app-firewall/po/hi/firewall.po
+++ b/applications/luci-app-firewall/po/hi/firewall.po
@@ -125,7 +125,7 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgstr ""
 # Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr ""
 
@@ -300,7 +300,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr ""
 
@@ -453,7 +453,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/hu/firewall.po b/applications/luci-app-firewall/po/hu/firewall.po
index 185237b19..b3a80ca7e 100644
--- a/applications/luci-app-firewall/po/hu/firewall.po
+++ b/applications/luci-app-firewall/po/hu/firewall.po
@@ -126,7 +126,7 @@ msgstr "Lefedett hálózatok"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Egyéni szabályok"
 
@@ -237,7 +237,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Tűzfal"
 
@@ -301,7 +301,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Általános beállítások"
 
@@ -461,7 +461,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Port továbbítás"
 
@@ -647,7 +647,7 @@ msgid "To %s, %s in %s"
 msgstr "%s-re, %s %s-ben"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Forgalmi szabályok"
 
diff --git a/applications/luci-app-firewall/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po
index df09c8a0c..df9101144 100644
--- a/applications/luci-app-firewall/po/it/firewall.po
+++ b/applications/luci-app-firewall/po/it/firewall.po
@@ -127,7 +127,7 @@ msgstr "Reti coperte"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Regole Personalizzate"
 
@@ -238,7 +238,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -302,7 +302,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Opzioni Generali"
 
@@ -459,7 +459,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Inoltri Porta"
 
@@ -664,7 +664,7 @@ msgid "To %s, %s in %s"
 msgstr "Verso %s, %s in %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Regole di Traffico"
 
diff --git a/applications/luci-app-firewall/po/ja/firewall.po b/applications/luci-app-firewall/po/ja/firewall.po
index 71a3d4735..59d3fd6ca 100644
--- a/applications/luci-app-firewall/po/ja/firewall.po
+++ b/applications/luci-app-firewall/po/ja/firewall.po
@@ -136,7 +136,7 @@ msgstr "対象ネットワーク"
 msgid "Covered subnets"
 msgstr "カバーされるサブネット"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "手動設定ルール"
 
@@ -250,7 +250,7 @@ msgstr "追加の iptables 引数"
 msgid "Extra source arguments"
 msgstr "追加の送信元引数"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "ファイアウォール"
 
@@ -314,7 +314,7 @@ msgstr "送信元 %s, %s, %s (<var>デバイス</var>)"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "一般設定"
 
@@ -480,7 +480,7 @@ msgstr ""
 "なりません。"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "ポートフォワーディング"
 
@@ -665,7 +665,7 @@ msgid "To %s, %s in %s"
 msgstr "宛先 %s, %s (%s)"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "トラフィック・ルール"
 
diff --git a/applications/luci-app-firewall/po/ko/firewall.po b/applications/luci-app-firewall/po/ko/firewall.po
index b3caa3673..e6a932b8b 100644
--- a/applications/luci-app-firewall/po/ko/firewall.po
+++ b/applications/luci-app-firewall/po/ko/firewall.po
@@ -127,7 +127,7 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Custom Rule"
 
@@ -237,7 +237,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "방화벽"
 
@@ -301,7 +301,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr ""
 
@@ -454,7 +454,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Port Forward"
 
@@ -637,7 +637,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Traffic Rule"
 
diff --git a/applications/luci-app-firewall/po/mr/firewall.po b/applications/luci-app-firewall/po/mr/firewall.po
index fb67a00db..a55e57294 100644
--- a/applications/luci-app-firewall/po/mr/firewall.po
+++ b/applications/luci-app-firewall/po/mr/firewall.po
@@ -128,7 +128,7 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr ""
 
@@ -239,7 +239,7 @@ msgstr ""
 # Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr ""
 
@@ -456,7 +456,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr ""
 
@@ -653,7 +653,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/ms/firewall.po b/applications/luci-app-firewall/po/ms/firewall.po
index 9cae5b1f3..7eae14cda 100644
--- a/applications/luci-app-firewall/po/ms/firewall.po
+++ b/applications/luci-app-firewall/po/ms/firewall.po
@@ -121,7 +121,7 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr ""
 
@@ -228,7 +228,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr ""
 
@@ -292,7 +292,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr ""
 
@@ -445,7 +445,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr ""
 
@@ -612,7 +612,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/no/firewall.po b/applications/luci-app-firewall/po/no/firewall.po
index f6f1daa92..96cc6f037 100644
--- a/applications/luci-app-firewall/po/no/firewall.po
+++ b/applications/luci-app-firewall/po/no/firewall.po
@@ -122,7 +122,7 @@ msgstr "Gjeldene nettverk"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Egendefinerte Regler"
 
@@ -232,7 +232,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Brannmur"
 
@@ -296,7 +296,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Generelle Innstillinger"
 
@@ -453,7 +453,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Port Videresendinger"
 
@@ -639,7 +639,7 @@ msgid "To %s, %s in %s"
 msgstr "Til %s, %s i %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Trafikk Regler"
 
diff --git a/applications/luci-app-firewall/po/pl/firewall.po b/applications/luci-app-firewall/po/pl/firewall.po
index 86459989f..3a3a76c14 100644
--- a/applications/luci-app-firewall/po/pl/firewall.po
+++ b/applications/luci-app-firewall/po/pl/firewall.po
@@ -138,7 +138,7 @@ msgstr "Objęte sieci"
 msgid "Covered subnets"
 msgstr "Objęte podsieci"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Własne reguły"
 
@@ -255,7 +255,7 @@ msgstr "Dodatkowe argumenty zródłowe"
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Zapora"
 
@@ -319,7 +319,7 @@ msgstr "Z %s na <var>to urządzenie</var> ze źródłem %s oraz %s"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Ustawienia główne"
 
@@ -483,7 +483,7 @@ msgstr ""
 "usługi."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Przekierowania portów"
 
@@ -634,11 +634,11 @@ msgid ""
 "forwarded traffic between different networks within the zone. <em>Covered "
 "networks</em> specifies which available networks are members of this zone."
 msgstr ""
-"Ta sekcja definiuje ustawienia ogólne %q. Opcje <em>\"wejście\"</em> i <em>\""
-"wyjście\"</em> określające domyślną politykę dla ruchu przychodzącego i "
+"Ta sekcja definiuje ustawienia ogólne %q. Opcje <em>\"wejście\"</em> i <em>"
+"\"wyjście\"</em> określające domyślną politykę dla ruchu przychodzącego i "
 "wychodzącego w tej strefie, podczas gdy <em>\"przekazywanie\"</em> opisuje "
-"politykę ruchu przekazywanego pomiędzy różnymi sieciami wewnątrz strefy. <em>"
-"Objęte sieci</em> określają dostępne sieci będące członkami tej strefy."
+"politykę ruchu przekazywanego pomiędzy różnymi sieciami wewnątrz strefy. "
+"<em>Objęte sieci</em> określają dostępne sieci będące członkami tej strefy."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
@@ -669,7 +669,7 @@ msgid "To %s, %s in %s"
 msgstr "Do %s, %s w %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Reguły ruchu sieciowego"
 
@@ -710,8 +710,8 @@ msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
-"Opcja ta służy do klasyfikacji ruchu strefowego według surowych, "
-"nie-<em>uci</em> obsługiwanych urządzeń sieciowych."
+"Opcja ta służy do klasyfikacji ruchu strefowego według surowych, nie-"
+"<em>uci</em> obsługiwanych urządzeń sieciowych."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
diff --git a/applications/luci-app-firewall/po/pt-br/firewall.po b/applications/luci-app-firewall/po/pt-br/firewall.po
index 2cb5e8985..4e9ec0106 100644
--- a/applications/luci-app-firewall/po/pt-br/firewall.po
+++ b/applications/luci-app-firewall/po/pt-br/firewall.po
@@ -136,7 +136,7 @@ msgstr "Redes cobertas"
 msgid "Covered subnets"
 msgstr "Sub-redes cobertas"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Regras Personalizadas"
 
@@ -252,7 +252,7 @@ msgstr "Argumentos extras para o iptables"
 msgid "Extra source arguments"
 msgstr "Argumentos extras da fonte"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -316,7 +316,7 @@ msgstr "De %s <var>neste dispositivo</var> com origem %s e %s"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
@@ -479,7 +479,7 @@ msgstr ""
 "regras do firewall expondo todos os serviços completamente."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Encaminhamentos de Porta"
 
@@ -663,7 +663,7 @@ msgid "To %s, %s in %s"
 msgstr "Para %s, %s em %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Regras de tráfego"
 
diff --git a/applications/luci-app-firewall/po/pt/firewall.po b/applications/luci-app-firewall/po/pt/firewall.po
index 2c3c6f958..f2093b854 100644
--- a/applications/luci-app-firewall/po/pt/firewall.po
+++ b/applications/luci-app-firewall/po/pt/firewall.po
@@ -136,7 +136,7 @@ msgstr "Redes abrangidas"
 msgid "Covered subnets"
 msgstr "Subredes abrangidas"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Regras Personalizadas"
 
@@ -252,7 +252,7 @@ msgstr "Argumentos adicionais do iptables"
 msgid "Extra source arguments"
 msgstr "Argumentos adicionais da fonte"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -316,7 +316,7 @@ msgstr "De %s <var>neste aparelho</var> com as fontes %s e %s"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
@@ -478,7 +478,7 @@ msgstr ""
 "firewall quebrado, expondo completamente todos os serviços."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Encaminhamento de Portas"
 
@@ -665,7 +665,7 @@ msgid "To %s, %s in %s"
 msgstr "Para %s, %s em %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Regras de Tráfego"
 
diff --git a/applications/luci-app-firewall/po/ro/firewall.po b/applications/luci-app-firewall/po/ro/firewall.po
index 4942371b5..1269a0e25 100644
--- a/applications/luci-app-firewall/po/ro/firewall.po
+++ b/applications/luci-app-firewall/po/ro/firewall.po
@@ -127,7 +127,7 @@ msgstr "Retele acoperite"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Reguli suplimentare"
 
@@ -234,7 +234,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -298,7 +298,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Setari generale"
 
@@ -451,7 +451,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr ""
 
@@ -618,7 +618,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po
index eec638b87..73b0e5935 100644
--- a/applications/luci-app-firewall/po/ru/firewall.po
+++ b/applications/luci-app-firewall/po/ru/firewall.po
@@ -138,7 +138,7 @@ msgstr "Охватываемые сети"
 msgid "Covered subnets"
 msgstr "Охватываемые подсети"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Пользовательские правила"
 
@@ -254,7 +254,7 @@ msgstr "Дополнительные аргументы iptables"
 msgid "Extra source arguments"
 msgstr "Дополнительные аргументы для источника"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Межсетевой экран"
 
@@ -318,7 +318,7 @@ msgstr "Из %s в <var>это устройство</var> с источника�
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Основные настройки"
 
@@ -485,7 +485,7 @@ msgstr ""
 "правил межсетевого экрана, полностью открывая доступ ко всем службам системы."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Перенаправление портов"
 
@@ -670,7 +670,7 @@ msgid "To %s, %s in %s"
 msgstr "К %s, %s в %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Правила для трафика"
 
diff --git a/applications/luci-app-firewall/po/sk/firewall.po b/applications/luci-app-firewall/po/sk/firewall.po
index e5d73e2d0..d31bcfefa 100644
--- a/applications/luci-app-firewall/po/sk/firewall.po
+++ b/applications/luci-app-firewall/po/sk/firewall.po
@@ -122,7 +122,7 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr ""
 
@@ -229,7 +229,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr ""
 
@@ -293,7 +293,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr ""
 
@@ -446,7 +446,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr ""
 
@@ -613,7 +613,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/sv/firewall.po b/applications/luci-app-firewall/po/sv/firewall.po
index 32819e7bb..d76220401 100644
--- a/applications/luci-app-firewall/po/sv/firewall.po
+++ b/applications/luci-app-firewall/po/sv/firewall.po
@@ -126,7 +126,7 @@ msgstr "Nätverk som omfattas"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Anpassade regler"
 
@@ -233,7 +233,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Brandvägg"
 
@@ -297,7 +297,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Generella inställningar"
 
@@ -453,7 +453,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Vidarebefordringar av port"
 
@@ -620,7 +620,7 @@ msgid "To %s, %s in %s"
 msgstr "Till %s, %s i %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Trafikregler"
 
diff --git a/applications/luci-app-firewall/po/templates/firewall.pot b/applications/luci-app-firewall/po/templates/firewall.pot
index 8d290d664..91d3bd458 100644
--- a/applications/luci-app-firewall/po/templates/firewall.pot
+++ b/applications/luci-app-firewall/po/templates/firewall.pot
@@ -115,7 +115,7 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr ""
 
@@ -222,7 +222,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr ""
 
@@ -286,7 +286,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr ""
 
@@ -439,7 +439,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr ""
 
@@ -606,7 +606,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/tr/firewall.po b/applications/luci-app-firewall/po/tr/firewall.po
index f3d850961..1db3c1127 100644
--- a/applications/luci-app-firewall/po/tr/firewall.po
+++ b/applications/luci-app-firewall/po/tr/firewall.po
@@ -126,7 +126,7 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr ""
 
@@ -233,7 +233,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr ""
 
@@ -297,7 +297,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr ""
 
@@ -450,7 +450,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr ""
 
@@ -617,7 +617,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po
index 2aeaedecc..39272a55e 100644
--- a/applications/luci-app-firewall/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
@@ -140,7 +140,7 @@ msgstr "Охоплені мережі"
 msgid "Covered subnets"
 msgstr "Охоплені підмережі"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "Настроювані правила"
 
@@ -256,7 +256,7 @@ msgstr "Додаткові аргументи iptables"
 msgid "Extra source arguments"
 msgstr "Додаткові аргументи для джерела"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Брандмауер"
 
@@ -320,7 +320,7 @@ msgstr "Від %s на <var>цьому пристрої</var> з джерело�
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "Загальні параметри"
 
@@ -483,7 +483,7 @@ msgstr ""
 "порушення набору правил брандмауера, повністю відкриваючи всі служби."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "Переспрямовування портів"
 
@@ -667,7 +667,7 @@ msgid "To %s, %s in %s"
 msgstr "%s, %s у %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "Правила трафіка"
 
diff --git a/applications/luci-app-firewall/po/vi/firewall.po b/applications/luci-app-firewall/po/vi/firewall.po
index 068b3954c..6b84e0f5a 100644
--- a/applications/luci-app-firewall/po/vi/firewall.po
+++ b/applications/luci-app-firewall/po/vi/firewall.po
@@ -130,7 +130,7 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr ""
 
@@ -239,7 +239,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -303,7 +303,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr ""
 
@@ -459,7 +459,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr ""
 
@@ -631,7 +631,7 @@ msgid "To %s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/zh-cn/firewall.po b/applications/luci-app-firewall/po/zh-cn/firewall.po
index e64d006c6..7e9e06af7 100644
--- a/applications/luci-app-firewall/po/zh-cn/firewall.po
+++ b/applications/luci-app-firewall/po/zh-cn/firewall.po
@@ -134,7 +134,7 @@ msgstr "涵盖的网络"
 msgid "Covered subnets"
 msgstr "涵盖的子网"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "自定义规则"
 
@@ -245,7 +245,7 @@ msgstr "额外的 iptables 参数"
 msgid "Extra source arguments"
 msgstr "额外的源参数"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "防火墙"
 
@@ -309,7 +309,7 @@ msgstr "来自 %s 位于<var>本设备</var>源端口 %s 源 MAC %s"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "基本设置"
 
@@ -465,7 +465,7 @@ msgstr ""
 "而对外暴露所有服务。"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "端口转发"
 
@@ -640,7 +640,7 @@ msgid "To %s, %s in %s"
 msgstr "到 %s, %s 位于 %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "通信规则"
 
diff --git a/applications/luci-app-firewall/po/zh-tw/firewall.po b/applications/luci-app-firewall/po/zh-tw/firewall.po
index 496a154a6..dc3d61441 100644
--- a/applications/luci-app-firewall/po/zh-tw/firewall.po
+++ b/applications/luci-app-firewall/po/zh-tw/firewall.po
@@ -125,7 +125,7 @@ msgstr "覆蓋網路"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
 msgid "Custom Rules"
 msgstr "自訂規則"
 
@@ -234,7 +234,7 @@ msgstr ""
 msgid "Extra source arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:3
 msgid "Firewall"
 msgstr "防火牆"
 
@@ -298,7 +298,7 @@ msgstr "來自 %s 位於<var>本裝置</var>源埠 %s 源 MAC %s"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:16
 msgid "General Settings"
 msgstr "基本設定"
 
@@ -451,7 +451,7 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:25
 msgid "Port Forwards"
 msgstr "埠轉發"
 
@@ -625,7 +625,7 @@ msgid "To %s, %s in %s"
 msgstr "到 %s, %s 位於 %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:34
 msgid "Traffic Rules"
 msgstr "通訊規則"
 
diff --git a/applications/luci-app-ocserv/po/bg/ocserv.po b/applications/luci-app-ocserv/po/bg/ocserv.po
index f38d41285..362fabd6a 100644
--- a/applications/luci-app-ocserv/po/bg/ocserv.po
+++ b/applications/luci-app-ocserv/po/bg/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -99,7 +93,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/ca/ocserv.po b/applications/luci-app-ocserv/po/ca/ocserv.po
index da00b7c34..d861657f1 100644
--- a/applications/luci-app-ocserv/po/ca/ocserv.po
+++ b/applications/luci-app-ocserv/po/ca/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.9.1-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr "S’estan recollint dades…"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -74,29 +68,29 @@ msgstr "Dispositiu"
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -105,7 +99,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
 msgid "Password"
 msgstr "Contrasenya"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
 msgid "Status"
 msgstr "Estat"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/cs/ocserv.po b/applications/luci-app-ocserv/po/cs/ocserv.po
index f66edcac3..bc53d2d71 100644
--- a/applications/luci-app-ocserv/po/cs/ocserv.po
+++ b/applications/luci-app-ocserv/po/cs/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -54,12 +48,12 @@ msgstr "Šifra"
 msgid "Collecting data..."
 msgstr "Probíhá sběr dat..."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -74,29 +68,29 @@ msgstr "Zařízení"
 msgid "Edit Template"
 msgstr "Editovat šablonu"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -105,7 +99,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr "IP adresa"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
 msgid "Name"
 msgstr "Název"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
 msgid "Password"
 msgstr "Heslo"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr "Nastavení serveru"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
 msgid "Status"
 msgstr "Stav"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -288,7 +278,7 @@ msgstr "Čas"
 msgid "User"
 msgstr "Uživatel"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/de/ocserv.po b/applications/luci-app-ocserv/po/de/ocserv.po
index 9a151e96d..ed54302f8 100644
--- a/applications/luci-app-ocserv/po/de/ocserv.po
+++ b/applications/luci-app-ocserv/po/de/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -54,12 +48,12 @@ msgstr "Verschlüsselungsalgorithmus"
 msgid "Collecting data..."
 msgstr "Sammle Daten..."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -74,29 +68,29 @@ msgstr "Gerät"
 msgid "Edit Template"
 msgstr "Template bearbeiten"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -105,7 +99,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
 msgid "IP"
 msgstr "IP"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr "IP-Adresse"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
 msgid "Name"
 msgstr "Name"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
 msgid "Password"
 msgstr "Passwort"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr "Servereinstellungen"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
 msgid "Status"
 msgstr "Status"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -288,7 +278,7 @@ msgstr "Zeit"
 msgid "User"
 msgstr "Nutzer"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
 msgid "Username"
 msgstr "Benutzername"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/el/ocserv.po b/applications/luci-app-ocserv/po/el/ocserv.po
index 257b766d4..a40937869 100644
--- a/applications/luci-app-ocserv/po/el/ocserv.po
+++ b/applications/luci-app-ocserv/po/el/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr "Συλλογή δεδομένων..."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -74,29 +68,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -105,7 +99,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/en/ocserv.po b/applications/luci-app-ocserv/po/en/ocserv.po
index dfad1d98e..e2089fec8 100644
--- a/applications/luci-app-ocserv/po/en/ocserv.po
+++ b/applications/luci-app-ocserv/po/en/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -99,7 +93,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/es/ocserv.po b/applications/luci-app-ocserv/po/es/ocserv.po
index eeebaae9f..14855db69 100644
--- a/applications/luci-app-ocserv/po/es/ocserv.po
+++ b/applications/luci-app-ocserv/po/es/ocserv.po
@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -30,15 +30,7 @@ msgstr "Usuarios activos de OpenConnect"
 msgid "Active users"
 msgstr "Usuarios activos"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-"Un valor alternativo que se comunicará al cliente para verificar el "
-"certificado del servidor; este valor solo depende de la clave pública"
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr "Compatibilidad con el cliente AnyConnect"
@@ -61,12 +53,12 @@ msgstr "Cifrado"
 msgid "Collecting data..."
 msgstr "Recolectando datos…"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr "Servidores DNS"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr "Tiempo muerto de detección de pares (segundos)"
@@ -81,18 +73,18 @@ msgstr "Dispositivo"
 msgid "Edit Template"
 msgstr "Editar plantilla"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 "Edite la plantilla que se utiliza para generar la configuración de ocserv."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr "Activar UDP"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
@@ -101,12 +93,12 @@ msgstr ""
 "Activar el soporte del canal UDP; esto debe estar activado a menos que sepa "
 "lo que está haciendo"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr "Activar compresión"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr "Activar proxy arp"
 
@@ -115,7 +107,7 @@ msgstr "Activar proxy arp"
 msgid "Enable server"
 msgstr "Activar  servidor"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr "Active el soporte para clientes CISCO AnyConnect"
@@ -143,20 +135,20 @@ msgstr "ID"
 msgid "IP"
 msgstr "IP"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr "Dirección IP"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr "Máx. clientes"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr "Max. mismos clientes"
@@ -165,7 +157,7 @@ msgstr "Max. mismos clientes"
 msgid "Name"
 msgstr "Nombre"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr "Máscara de red (o prefijo IPv6)"
@@ -181,17 +173,17 @@ msgstr "OpenConnect VPN"
 msgid "Password"
 msgstr "Contraseña"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr "Puerto"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr "IP predecibles"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -205,7 +197,7 @@ msgstr ""
 "que no debe estar en uso. Si tiene una red en LAN que cubre 192.168.1.0/24, "
 "use 192.168.1.192/26 para reservar las 62 direcciones superiores."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr "Tabla de ruteo"
@@ -214,34 +206,22 @@ msgstr "Tabla de ruteo"
 msgid "Server Settings"
 msgstr "Configuración del servidor"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
 msgid "Server's Public Key ID"
 msgstr "ID de clave pública del servidor"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
-msgstr "Certificado de servidor SHA1 hash"
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:58
 msgid "Status"
 msgstr "Estado"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-"Ese valor debe comunicarse al cliente para verificar el certificado del "
-"servidor"
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 "Los servidores DNS que se proporcionarán a los clientes; puede ser IPv6 o "
 "IPv4"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
@@ -249,7 +229,7 @@ msgstr ""
 "Los servidores DNS que se proporcionarán a los clientes; puede ser IPv6 o "
 "IPv4. Por lo general, debe incluir la dirección de este dispositivo"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
@@ -259,7 +239,7 @@ msgstr ""
 "ser una red privada diferente de las direcciones LAN a menos que el proxy "
 "ARP esté activado. Deje en blanco para intentar la configuración automática."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
@@ -267,12 +247,12 @@ msgstr ""
 "La dirección de subred IPv6 para proporcionar a los clientes; déjelo en "
 "blanco para intentar la configuración automática."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr "Las IP asignadas se seleccionarán de manera determinista"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -287,11 +267,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr "La zona de firewall en la que se establecerán los clientes VPN"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr "La máscara de la subred de antes."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -302,11 +282,17 @@ msgstr ""
 "rutas IPv4 e IPv6, el servidor enviará solo lo apropiado. Deje en blanco "
 "para establecer una ruta predeterminada"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr "Se usarán los mismos puertos UDP y TCP"
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr "No hay usuarios activos."
@@ -320,7 +306,7 @@ msgstr "Hora"
 msgid "User"
 msgstr "Usuario"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr "Autenticacion de usuario"
@@ -333,20 +319,20 @@ msgstr "Configuración de usuario"
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 "Máscara de red VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 "Dirección de red VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -361,7 +347,7 @@ msgstr "IP VPN"
 msgid "VPN IP Address"
 msgstr "Dirección IP VPN"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
@@ -369,3 +355,20 @@ msgid ""
 msgstr ""
 "Ver el certificado de CA utilizado por este servidor. Deberá guardarlo como "
 "'ca.pem' e importarlo a los clientes."
+
+#~ msgid ""
+#~ "An alternative value to be communicated to the client to verify the "
+#~ "server's certificate; this value only depends on the public key"
+#~ msgstr ""
+#~ "Un valor alternativo que se comunicará al cliente para verificar el "
+#~ "certificado del servidor; este valor solo depende de la clave pública"
+
+#~ msgid "Server's certificate SHA1 hash"
+#~ msgstr "Certificado de servidor SHA1 hash"
+
+#~ msgid ""
+#~ "That value should be communicated to the client to verify the server's "
+#~ "certificate"
+#~ msgstr ""
+#~ "Ese valor debe comunicarse al cliente para verificar el certificado del "
+#~ "servidor"
diff --git a/applications/luci-app-ocserv/po/fr/ocserv.po b/applications/luci-app-ocserv/po/fr/ocserv.po
index 20e90f902..82b52006e 100644
--- a/applications/luci-app-ocserv/po/fr/ocserv.po
+++ b/applications/luci-app-ocserv/po/fr/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -54,12 +48,12 @@ msgstr "Code de chiffrement"
 msgid "Collecting data..."
 msgstr "Récupération des données…"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -74,29 +68,29 @@ msgstr "Appareil"
 msgid "Edit Template"
 msgstr "Modifier le modèle"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -105,7 +99,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
 msgid "Password"
 msgstr "Mot de passe"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
 msgid "Status"
 msgstr "État"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -288,7 +278,7 @@ msgstr "Heure"
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/he/ocserv.po b/applications/luci-app-ocserv/po/he/ocserv.po
index 8bdd803c4..63c014b98 100644
--- a/applications/luci-app-ocserv/po/he/ocserv.po
+++ b/applications/luci-app-ocserv/po/he/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -99,7 +93,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/hi/ocserv.po b/applications/luci-app-ocserv/po/hi/ocserv.po
index e0f3b7180..d4499a41f 100644
--- a/applications/luci-app-ocserv/po/hi/ocserv.po
+++ b/applications/luci-app-ocserv/po/hi/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -99,7 +93,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/hu/ocserv.po b/applications/luci-app-ocserv/po/hu/ocserv.po
index f0d4c89fb..4c0249d80 100644
--- a/applications/luci-app-ocserv/po/hu/ocserv.po
+++ b/applications/luci-app-ocserv/po/hu/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr "Adatok összegyűjtése…"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -74,29 +68,29 @@ msgstr "Eszköz"
 msgid "Edit Template"
 msgstr "Sablon szerkesztése"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -105,7 +99,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
 msgid "Name"
 msgstr "Név"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
 msgid "Password"
 msgstr "Jelszó"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr "Kiszolgáló beállításai"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
 msgid "Status"
 msgstr "Állapot"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -288,7 +278,7 @@ msgstr "Idő"
 msgid "User"
 msgstr "Felhasználó"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/it/ocserv.po b/applications/luci-app-ocserv/po/it/ocserv.po
index 136765c18..c1d696435 100644
--- a/applications/luci-app-ocserv/po/it/ocserv.po
+++ b/applications/luci-app-ocserv/po/it/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -74,29 +68,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -105,7 +99,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
 msgid "Status"
 msgstr "Stato"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/ja/ocserv.po b/applications/luci-app-ocserv/po/ja/ocserv.po
index 91a78127b..09348c1c6 100644
--- a/applications/luci-app-ocserv/po/ja/ocserv.po
+++ b/applications/luci-app-ocserv/po/ja/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -99,7 +93,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/ko/ocserv.po b/applications/luci-app-ocserv/po/ko/ocserv.po
index 2f24691b1..26f1c9a41 100644
--- a/applications/luci-app-ocserv/po/ko/ocserv.po
+++ b/applications/luci-app-ocserv/po/ko/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -99,7 +93,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/mr/ocserv.po b/applications/luci-app-ocserv/po/mr/ocserv.po
index 272101b19..9a12906a9 100644
--- a/applications/luci-app-ocserv/po/mr/ocserv.po
+++ b/applications/luci-app-ocserv/po/mr/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr "डेटा संकलित करीत आहे ..."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -74,29 +68,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -105,7 +99,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr "पोर्ट"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/ms/ocserv.po b/applications/luci-app-ocserv/po/ms/ocserv.po
index 81591388d..4fa9e6f73 100644
--- a/applications/luci-app-ocserv/po/ms/ocserv.po
+++ b/applications/luci-app-ocserv/po/ms/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -99,7 +93,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/nb_NO/ocserv.po b/applications/luci-app-ocserv/po/nb_NO/ocserv.po
index 07276f38c..ad3cbb39a 100644
--- a/applications/luci-app-ocserv/po/nb_NO/ocserv.po
+++ b/applications/luci-app-ocserv/po/nb_NO/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.9.1\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr "Samler inn data…"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -74,29 +68,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -105,7 +99,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/pl/ocserv.po b/applications/luci-app-ocserv/po/pl/ocserv.po
index fb1b8e005..3c1f77777 100644
--- a/applications/luci-app-ocserv/po/pl/ocserv.po
+++ b/applications/luci-app-ocserv/po/pl/ocserv.po
@@ -11,7 +11,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -26,13 +26,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -55,12 +49,12 @@ msgstr "Szyfr"
 msgid "Collecting data..."
 msgstr "Trwa zbieranie danych..."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -75,29 +69,29 @@ msgstr "Urządzenie"
 msgid "Edit Template"
 msgstr "Edytuj szablon"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -106,7 +100,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -134,20 +128,20 @@ msgstr ""
 msgid "IP"
 msgstr "IP"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr "Adres IP"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr "Maks. klientów"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -156,7 +150,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nazwa"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -172,17 +166,17 @@ msgstr ""
 msgid "Password"
 msgstr "Hasło"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -191,7 +185,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -200,12 +194,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr "Ustawienia serwera"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -213,41 +203,35 @@ msgstr ""
 msgid "Status"
 msgstr "Status"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -259,11 +243,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -271,11 +255,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -289,7 +279,7 @@ msgstr "Czas"
 msgid "User"
 msgstr "Użytkownik"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -302,18 +292,18 @@ msgstr ""
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -327,7 +317,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/pt/ocserv.po b/applications/luci-app-ocserv/po/pt/ocserv.po
index 153ecbf46..0721b3d4a 100644
--- a/applications/luci-app-ocserv/po/pt/ocserv.po
+++ b/applications/luci-app-ocserv/po/pt/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -27,15 +27,7 @@ msgstr "Utilizadores de Active OpenConnect"
 msgid "Active users"
 msgstr "Utilizadores ativos"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-"Um valor alternativo a ser comunicado ao cliente para verificar o "
-"certificado do servidor; este valor depende apenas da chave pública"
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr "Compatibilidade do cliente AnyConnect"
@@ -58,12 +50,12 @@ msgstr "Cifra"
 msgid "Collecting data..."
 msgstr "A recolher dados..."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr "Servidores DNS"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr "Tempo de deteção de pares mortos (segundos)"
@@ -78,17 +70,17 @@ msgstr "Aparelho"
 msgid "Edit Template"
 msgstr "Editar Modelo"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr "Editar o modelo que é usado para gerar a configuração cifsd."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr "Ativar UDP"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
@@ -97,12 +89,12 @@ msgstr ""
 "Ativar o suporte de canais UDP; isso deve ser ativado a menos que saiba o "
 "que está fazendo"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr "Ativar compressão"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr "Ativar proxy de arp"
 
@@ -111,7 +103,7 @@ msgstr "Ativar proxy de arp"
 msgid "Enable server"
 msgstr "Ativar servidor"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr "Ativar o suporte para clientes de CISCO AnyConnect"
@@ -139,20 +131,20 @@ msgstr "ID"
 msgid "IP"
 msgstr "IP"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr "Endereço IP"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr "Máximo de clientes"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr "Máximo de mesmos clientes"
@@ -161,7 +153,7 @@ msgstr "Máximo de mesmos clientes"
 msgid "Name"
 msgstr "Nome"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr "Máscara de rede (ou prefixo de IPv6)"
@@ -177,17 +169,17 @@ msgstr "VPN OpenConnect"
 msgid "Password"
 msgstr "Palavra-passe"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr "Porta"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr "IPs Previsíveis"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -201,7 +193,7 @@ msgstr ""
 "tiver uma rede na LAN que cubra 192.168.1.0/24 utilize 192.168.1.192/26 para "
 "reservar os 62 endereços superiores."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr "Tabela de roteamento"
@@ -210,33 +202,21 @@ msgstr "Tabela de roteamento"
 msgid "Server Settings"
 msgstr "Configurações do Servidor"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
 msgid "Server's Public Key ID"
 msgstr "ID da Chave Pública do Servidor"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
-msgstr "Hash SHA1 do certificado do servidor"
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:58
 msgid "Status"
 msgstr "Estado"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-"Esse valor deve ser comunicado ao cliente para verificar o certificado do "
-"servidor"
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 "Os servidores DNS a serem fornecidos aos clientes; podem ser IPv6 ou IPv4"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
@@ -244,7 +224,7 @@ msgstr ""
 "Os servidores DNS a serem fornecidos aos clientes; podem ser IPv6 ou IPv4. "
 "Normalmente deve incluir o endereço deste aparelho"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
@@ -254,7 +234,7 @@ msgstr ""
 "alguma rede privada diferente dos endereços LAN, a menos que o proxy ARP "
 "esteja ativado. Deixe vazio para tentar a autoconfiguração."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
@@ -262,12 +242,12 @@ msgstr ""
 "O endereço de sub-rede IPv6 a fornecer aos clientes; deixe vazio para tentar "
 "a autoconfiguração."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr "Os IPs atribuídos serão selecionados de forma determinística"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -282,11 +262,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr "A zona do firewall em qual os clientes VPN serão atribuido"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr "A máscara da sub-rede acima."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -297,11 +277,17 @@ msgstr ""
 "rotas IPv4 e IPv6, o servidor enviará apenas o apropriado. Deixe vazio para "
 "definir uma rota padrão"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr "As mesmas portas UDP e TCP serão usadas"
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr "Não há utilizadores ativos."
@@ -315,7 +301,7 @@ msgstr "Tempo"
 msgid "User"
 msgstr "Utilizador"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr "Autenticação do utilizador"
@@ -328,28 +314,28 @@ msgstr "Configurações do utilizador"
 msgid "Username"
 msgstr "Nome do utilizador"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
-"Máscara de rede VPN <abbr title=\"Protocolo de Internet Versão 4\""
-">IPv4</abbr>"
+"Máscara de rede VPN <abbr title=\"Protocolo de Internet Versão 4\">IPv4</"
+"abbr>"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
-"Endereço de rede VPN <abbr title=\"Protocolo de Internet Versão 4\""
-">IPv4</abbr>"
+"Endereço de rede VPN <abbr title=\"Protocolo de Internet Versão 4\">IPv4</"
+"abbr>"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
 msgstr ""
-"Endereço de rede VPN <abbr title=\"Protocolo de Internet Versão 6\""
-">IPv6</abbr>"
+"Endereço de rede VPN <abbr title=\"Protocolo de Internet Versão 6\">IPv6</"
+"abbr>"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:69
 msgid "VPN IP"
@@ -359,7 +345,7 @@ msgstr "IP da VPN"
 msgid "VPN IP Address"
 msgstr "Endereço IP da VPN"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
@@ -367,3 +353,20 @@ msgid ""
 msgstr ""
 "Veja o certificado AC utilizado por este servidor. Precisará gravá-lo como "
 "'ca.pem' e importá-lo para os clientes."
+
+#~ msgid ""
+#~ "An alternative value to be communicated to the client to verify the "
+#~ "server's certificate; this value only depends on the public key"
+#~ msgstr ""
+#~ "Um valor alternativo a ser comunicado ao cliente para verificar o "
+#~ "certificado do servidor; este valor depende apenas da chave pública"
+
+#~ msgid "Server's certificate SHA1 hash"
+#~ msgstr "Hash SHA1 do certificado do servidor"
+
+#~ msgid ""
+#~ "That value should be communicated to the client to verify the server's "
+#~ "certificate"
+#~ msgstr ""
+#~ "Esse valor deve ser comunicado ao cliente para verificar o certificado do "
+#~ "servidor"
diff --git a/applications/luci-app-ocserv/po/pt_BR/ocserv.po b/applications/luci-app-ocserv/po/pt_BR/ocserv.po
index d67fe5a7d..9276d3b31 100644
--- a/applications/luci-app-ocserv/po/pt_BR/ocserv.po
+++ b/applications/luci-app-ocserv/po/pt_BR/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -27,15 +27,7 @@ msgstr "Usuários ativos do OpenConnect"
 msgid "Active users"
 msgstr "Usuários ativos"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-"Um valor alternativo a ser comunicado ao cliente para verificar o "
-"certificado do servidor; este valor depende apenas da chave pública"
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr "Compatibilidade com o cliente AnyConnect"
@@ -58,12 +50,12 @@ msgstr "Cifra"
 msgid "Collecting data..."
 msgstr "Coletando dados..."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr "Servidores de DNS"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr "Tempo de detecção de pares inativos (segundos)"
@@ -78,17 +70,17 @@ msgstr "Dispositivo"
 msgid "Edit Template"
 msgstr "Editar modelo"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr "Edite o modelo que é usado para gerar a configuração do ocserv."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr "Ativar UDP"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
@@ -97,12 +89,12 @@ msgstr ""
 "Ativar o suporte a canais UDP; esta opção deve estar ativa a não ser que "
 "você saiba o que está fazendo"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr "Ativar compressão"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr "Ativar proxy arp"
 
@@ -111,7 +103,7 @@ msgstr "Ativar proxy arp"
 msgid "Enable server"
 msgstr "Ativar o servidor"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr "Ativar o suporte para clientes da CISCO AnyConnect"
@@ -139,20 +131,20 @@ msgstr "ID"
 msgid "IP"
 msgstr "IP"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr "Endereço IP"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr "Quantidade máxima de clientes"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr "Quantidade máxima de clientes iguais"
@@ -161,7 +153,7 @@ msgstr "Quantidade máxima de clientes iguais"
 msgid "Name"
 msgstr "Nome"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr "Máscara de Rede (ou prefixo IPv6)"
@@ -177,17 +169,17 @@ msgstr "OpenConnect VPN"
 msgid "Password"
 msgstr "Senha"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr "Porta"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr "IPs Previsíveis"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -198,10 +190,10 @@ msgstr ""
 "Fornece endereços para clientes de uma sub-rede LAN; se ativo a rede abaixo "
 "deve ser uma sub-rede da LAN. repare que o primeiro endereço da sub-net "
 "especificada será reservada pelo ocserv, assim tal endereço não deve estar "
-"em uso. Caso tenha uma rede na LAN cobrindo 192.168.1.0/24 utilize 192.168.1."
-"192/26 para que os 62 endereços acima sejam devidamente reservados."
+"em uso. Caso tenha uma rede na LAN cobrindo 192.168.1.0/24 utilize "
+"192.168.1.192/26 para que os 62 endereços acima sejam devidamente reservados."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr "Tabela de roteamento"
@@ -210,34 +202,22 @@ msgstr "Tabela de roteamento"
 msgid "Server Settings"
 msgstr "Configurações do Servidor"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
 msgid "Server's Public Key ID"
 msgstr "ID da Chave Pública do Servidor"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
-msgstr "Hash do certificado SHA1 do Servidor"
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:58
 msgid "Status"
 msgstr "Condição"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-"Este valor deve ser comunicado ao cliente para verificar o certificado do "
-"servidor"
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 "Os servidores de DNS a ser oferecido aos clientes; pode ser tanto IPv6 ou "
 "IPv4"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
@@ -245,7 +225,7 @@ msgstr ""
 "Os servidores DNS a ser oferecido aos clientes; pode ser tanto IPv6 ou IPv4. "
 "Geralmente você deve incluir o endereço deste dispositivo"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
@@ -255,7 +235,7 @@ msgstr ""
 "endereços de rede privados diferentes do endereço LAN a não ser que um proxy "
 "ARP esteja ativo. Para uma configuração automática, deixe a opção vazia."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
@@ -263,12 +243,12 @@ msgstr ""
 "O endereço IPv6 a ser oferecida aos clientes. Para uma configuração "
 "automática, deixe a opção vazia."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr "Os IPs atribuídos serão selecionados deterministicamente"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -283,11 +263,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr "A zona do firewall em que os clientes VPN serão enviados"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr "A máscara da sub-rede acima."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -298,11 +278,17 @@ msgstr ""
 "rotas IPv4 e IPv6, o servidor enviará o que for apropriado. Deixe vazio para "
 "definir uma rota padrão"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr "As mesmas portas UDP e TCP serão usadas"
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr "Não há usuários ativos."
@@ -316,7 +302,7 @@ msgstr "Tempo"
 msgid "User"
 msgstr "Usuário"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr "Autenticação do Usuário"
@@ -329,14 +315,14 @@ msgstr "Configurações do Usuário"
 msgid "Username"
 msgstr "Nome do Usuário"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 "VPN <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>-Máscara de "
 "Rede"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
@@ -344,7 +330,7 @@ msgstr ""
 "VPN <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>-Endereço de "
 "Rede"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -360,7 +346,7 @@ msgstr "IP da VPN"
 msgid "VPN IP Address"
 msgstr "Endereço IP da VPN"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
@@ -368,3 +354,20 @@ msgid ""
 msgstr ""
 "Exibir o certificado CA utilizado por este servidor. Você precisará salvá-lo "
 "como 'ca.pem' e importá-lo nos clientes."
+
+#~ msgid ""
+#~ "An alternative value to be communicated to the client to verify the "
+#~ "server's certificate; this value only depends on the public key"
+#~ msgstr ""
+#~ "Um valor alternativo a ser comunicado ao cliente para verificar o "
+#~ "certificado do servidor; este valor depende apenas da chave pública"
+
+#~ msgid "Server's certificate SHA1 hash"
+#~ msgstr "Hash do certificado SHA1 do Servidor"
+
+#~ msgid ""
+#~ "That value should be communicated to the client to verify the server's "
+#~ "certificate"
+#~ msgstr ""
+#~ "Este valor deve ser comunicado ao cliente para verificar o certificado do "
+#~ "servidor"
diff --git a/applications/luci-app-ocserv/po/ro/ocserv.po b/applications/luci-app-ocserv/po/ro/ocserv.po
index 294827214..0b166c566 100644
--- a/applications/luci-app-ocserv/po/ro/ocserv.po
+++ b/applications/luci-app-ocserv/po/ro/ocserv.po
@@ -11,7 +11,7 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -26,13 +26,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -55,12 +49,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -75,29 +69,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -106,7 +100,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -134,20 +128,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -156,7 +150,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -172,17 +166,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -191,7 +185,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -200,12 +194,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -213,41 +203,35 @@ msgstr ""
 msgid "Status"
 msgstr "stsatus"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -259,11 +243,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -271,11 +255,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -289,7 +279,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -302,18 +292,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -327,7 +317,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/ru/ocserv.po b/applications/luci-app-ocserv/po/ru/ocserv.po
index d7faf3a9a..9bfc086d7 100644
--- a/applications/luci-app-ocserv/po/ru/ocserv.po
+++ b/applications/luci-app-ocserv/po/ru/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -99,7 +93,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/sk/ocserv.po b/applications/luci-app-ocserv/po/sk/ocserv.po
index 4a59cca07..f93952649 100644
--- a/applications/luci-app-ocserv/po/sk/ocserv.po
+++ b/applications/luci-app-ocserv/po/sk/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -99,7 +93,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/sv/ocserv.po b/applications/luci-app-ocserv/po/sv/ocserv.po
index 18dc5b0a2..9562721bc 100644
--- a/applications/luci-app-ocserv/po/sv/ocserv.po
+++ b/applications/luci-app-ocserv/po/sv/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.9.1-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -54,12 +48,12 @@ msgstr "Chiffer"
 msgid "Collecting data..."
 msgstr "Samlar in data..."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -74,29 +68,29 @@ msgstr "Enhet"
 msgid "Edit Template"
 msgstr "Redigera mall"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -105,7 +99,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr "IP-adress"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
 msgid "Name"
 msgstr "Namn"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
 msgid "Password"
 msgstr "Lösenord"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr "Server-inställningar"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
 msgid "Status"
 msgstr "Status"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
 msgid "User"
 msgstr "Användare"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
 msgid "Username"
 msgstr "Användarnamn"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/templates/ocserv.pot b/applications/luci-app-ocserv/po/templates/ocserv.pot
index 8083170ce..2e96fb3fe 100644
--- a/applications/luci-app-ocserv/po/templates/ocserv.pot
+++ b/applications/luci-app-ocserv/po/templates/ocserv.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -16,13 +16,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -45,12 +39,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -65,29 +59,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -96,7 +90,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -124,20 +118,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -146,7 +140,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -162,17 +156,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -181,7 +175,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -190,12 +184,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -203,41 +193,35 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -249,11 +233,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -261,11 +245,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -279,7 +269,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -292,18 +282,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -317,7 +307,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/tr/ocserv.po b/applications/luci-app-ocserv/po/tr/ocserv.po
index c68633254..b966990c8 100644
--- a/applications/luci-app-ocserv/po/tr/ocserv.po
+++ b/applications/luci-app-ocserv/po/tr/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr "Veri alınıyor..."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -74,29 +68,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -105,7 +99,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
 msgid "Status"
 msgstr "Durum"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/uk/ocserv.po b/applications/luci-app-ocserv/po/uk/ocserv.po
index 78beba3b3..81a7fb71a 100644
--- a/applications/luci-app-ocserv/po/uk/ocserv.po
+++ b/applications/luci-app-ocserv/po/uk/ocserv.po
@@ -11,7 +11,7 @@ msgstr ""
 "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -26,13 +26,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -55,12 +49,12 @@ msgstr "Шифр"
 msgid "Collecting data..."
 msgstr "Збирання даних..."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -75,29 +69,29 @@ msgstr "Пристрій"
 msgid "Edit Template"
 msgstr "Редагувати шаблон"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -106,7 +100,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -134,20 +128,20 @@ msgstr ""
 msgid "IP"
 msgstr "IP-адреса"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -156,7 +150,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ім'я"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -172,17 +166,17 @@ msgstr ""
 msgid "Password"
 msgstr "Пароль"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr "Порт"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -191,7 +185,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -200,12 +194,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr "Налаштування сервера"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -213,41 +203,35 @@ msgstr ""
 msgid "Status"
 msgstr "Стан"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -259,11 +243,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -271,11 +255,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -289,7 +279,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -302,18 +292,18 @@ msgstr ""
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -327,7 +317,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/vi/ocserv.po b/applications/luci-app-ocserv/po/vi/ocserv.po
index 3fe783503..6c472d9ed 100644
--- a/applications/luci-app-ocserv/po/vi/ocserv.po
+++ b/applications/luci-app-ocserv/po/vi/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -54,12 +48,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr "Đang lấy dữ liệu..."
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -74,29 +68,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -105,7 +99,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
 msgid "Status"
 msgstr "Trạng thái"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -288,7 +278,7 @@ msgstr "Thời gian"
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/zh-cn/ocserv.po b/applications/luci-app-ocserv/po/zh-cn/ocserv.po
index 14a8ada3a..284983100 100644
--- a/applications/luci-app-ocserv/po/zh-cn/ocserv.po
+++ b/applications/luci-app-ocserv/po/zh-cn/ocserv.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -25,13 +25,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -54,12 +48,12 @@ msgstr "算法"
 msgid "Collecting data..."
 msgstr "正在收集数据…"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -74,29 +68,29 @@ msgstr "设备"
 msgid "Edit Template"
 msgstr "编辑模板"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -105,7 +99,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -133,20 +127,20 @@ msgstr ""
 msgid "IP"
 msgstr "IP"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr "最大客户端数量"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -155,7 +149,7 @@ msgstr ""
 msgid "Name"
 msgstr "名称"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -171,17 +165,17 @@ msgstr ""
 msgid "Password"
 msgstr "密码"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr "端口"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -190,7 +184,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -199,12 +193,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -212,41 +202,35 @@ msgstr ""
 msgid "Status"
 msgstr "状态"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -258,11 +242,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -270,11 +254,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -288,7 +278,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -301,18 +291,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -326,7 +316,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-ocserv/po/zh-tw/ocserv.po b/applications/luci-app-ocserv/po/zh-tw/ocserv.po
index 714dbf5a2..f86234bc7 100644
--- a/applications/luci-app-ocserv/po/zh-tw/ocserv.po
+++ b/applications/luci-app-ocserv/po/zh-tw/ocserv.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
@@ -19,13 +19,7 @@ msgstr ""
 msgid "Active users"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:23
-msgid ""
-"An alternative value to be communicated to the client to verify the server's "
-"certificate; this value only depends on the public key"
-msgstr ""
-
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:74
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr ""
@@ -48,12 +42,12 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:153
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111
 msgid "DNS servers"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:81
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:60
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:54
 msgid "Dead peer detection time (secs)"
 msgstr ""
@@ -68,29 +62,29 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:101
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:85
 msgid "Edit the template that is used for generating the ocserv configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:91
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:60
 msgid "Enable UDP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:92
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:61
 msgid ""
 "Enable UDP channel support; this must be enabled unless you know what you "
 "are doing"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:87
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:88
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:66
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:67
 msgid "Enable compression"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:127
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:106
 msgid "Enable proxy arp"
 msgstr ""
 
@@ -99,7 +93,7 @@ msgstr ""
 msgid "Enable server"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:96
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:75
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:65
 msgid "Enable support for CISCO AnyConnect clients"
 msgstr ""
@@ -127,20 +121,20 @@ msgstr ""
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:159
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:170
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:138
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:149
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:117
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:128
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:53
 msgid "IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:79
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:58
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:52
 msgid "Max clients"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:80
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:59
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:53
 msgid "Max same clients"
 msgstr ""
@@ -149,7 +143,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:172
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:151
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:131
 msgid "Netmask (or IPv6-prefix)"
 msgstr ""
@@ -165,17 +159,17 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:77
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:56
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:50
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:83
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:62
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:56
 msgid "Predictable IPs"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:128
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:107
 msgid ""
 "Provide addresses to clients from a subnet of LAN; if enabled the network "
 "below must be a subnet of LAN. Note that the first address of the specified "
@@ -184,7 +178,7 @@ msgid ""
 "upper 62 addresses."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:164
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:143
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:122
 msgid "Routing table"
 msgstr ""
@@ -193,12 +187,8 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
-msgid "Server's Public Key ID"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
-msgid "Server's certificate SHA1 hash"
+msgid "Server's Public Key ID"
 msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
@@ -206,41 +196,35 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
-msgid ""
-"That value should be communicated to the client to verify the server's "
-"certificate"
-msgstr ""
-
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:112
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:154
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:133
 msgid ""
 "The DNS servers to be provided to clients; can be either IPv6 or IPv4. "
 "Typically you should include the address of this device"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:111
 msgid ""
 "The IPv4 subnet address to provide to clients; this should be some private "
 "network different than the LAN addresses unless proxy ARP is enabled. Leave "
 "empty to attempt auto-configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:146
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:125
 msgid ""
 "The IPv6 subnet address to provide to clients; leave empty to attempt auto-"
 "configuration."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:84
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:63
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:57
 msgid "The assigned IPs will be selected deterministically"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:71
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:50
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:38
 msgid ""
 "The authentication method for the users. The simplest is plain with a single "
@@ -252,11 +236,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:137
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
 msgid "The mask of the subnet above."
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:165
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:144
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:123
 msgid ""
 "The routing table to be provided to clients; you can mix IPv4 and IPv6 "
@@ -264,11 +248,17 @@ msgid ""
 "default route"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:78
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:57
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:51
 msgid "The same UDP and TCP ports will be used"
 msgstr ""
 
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:21
+msgid ""
+"The value to be communicated to the client to verify the server's "
+"certificate; this value only depends on the public key"
+msgstr ""
+
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
 msgstr ""
@@ -282,7 +272,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:70
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:49
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:37
 msgid "User Authentication"
 msgstr ""
@@ -295,18 +285,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:136
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
 msgid "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:131
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:110
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:68
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:145
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
 msgid ""
 "VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"
@@ -320,7 +310,7 @@ msgstr ""
 msgid "VPN IP Address"
 msgstr ""
 
-#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:116
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:95
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:100
 msgid ""
 "View the CA certificate used by this server. You will need to save it as 'ca."
diff --git a/applications/luci-app-omcproxy/po/bg/omcproxy.po b/applications/luci-app-omcproxy/po/bg/omcproxy.po
index 5c3a22e42..acf972fea 100644
--- a/applications/luci-app-omcproxy/po/bg/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/bg/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/ca/omcproxy.po b/applications/luci-app-omcproxy/po/ca/omcproxy.po
index 459376de6..70229b5e0 100644
--- a/applications/luci-app-omcproxy/po/ca/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/ca/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/cs/omcproxy.po b/applications/luci-app-omcproxy/po/cs/omcproxy.po
index 68620cb6f..53bb28ca2 100644
--- a/applications/luci-app-omcproxy/po/cs/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/cs/omcproxy.po
@@ -10,67 +10,67 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr "Přidat instanci"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/de/omcproxy.po b/applications/luci-app-omcproxy/po/de/omcproxy.po
index 61b531d80..b2e61359d 100644
--- a/applications/luci-app-omcproxy/po/de/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/de/omcproxy.po
@@ -10,67 +10,67 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr "Instanz hinzufügen"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr "Standardeinstellung"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/el/omcproxy.po b/applications/luci-app-omcproxy/po/el/omcproxy.po
index 268f86794..94f54b859 100644
--- a/applications/luci-app-omcproxy/po/el/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/el/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/en/omcproxy.po b/applications/luci-app-omcproxy/po/en/omcproxy.po
index fcc3bb28f..40c04395c 100644
--- a/applications/luci-app-omcproxy/po/en/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/en/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/es/omcproxy.po b/applications/luci-app-omcproxy/po/es/omcproxy.po
index 108802f1e..c69954b07 100644
--- a/applications/luci-app-omcproxy/po/es/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/es/omcproxy.po
@@ -10,69 +10,69 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr "Añadir instancia"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr "Interfaz de enlace descendente"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr "Proxy IGMPv3 y MLDv2 incorporado"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 "Alcance mínimo de multidifusión al proxy (solo afecta a la multidifusión "
 "IPv6)"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr "Instancia de Proxy"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr "Alcance"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr "Interfaz de enlace ascendente"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr "¿De dónde viene la multidifusión?"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr "¿A dónde va la multidifusión?"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr "admin-local"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr "predeterminado"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr "global"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr "omcproxy"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr "organización-local"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr "reino"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr "sitio-local"
diff --git a/applications/luci-app-omcproxy/po/fr/omcproxy.po b/applications/luci-app-omcproxy/po/fr/omcproxy.po
index 1a2d7583b..99523f90f 100644
--- a/applications/luci-app-omcproxy/po/fr/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/fr/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/he/omcproxy.po b/applications/luci-app-omcproxy/po/he/omcproxy.po
index 06e1e5f66..1583d87b0 100644
--- a/applications/luci-app-omcproxy/po/he/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/he/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/hi/omcproxy.po b/applications/luci-app-omcproxy/po/hi/omcproxy.po
index 6f65af096..9cc7c220b 100644
--- a/applications/luci-app-omcproxy/po/hi/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/hi/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/hu/omcproxy.po b/applications/luci-app-omcproxy/po/hu/omcproxy.po
index f09922b27..3333c6f83 100644
--- a/applications/luci-app-omcproxy/po/hu/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/hu/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/it/omcproxy.po b/applications/luci-app-omcproxy/po/it/omcproxy.po
index 33b7ec9d5..fd32cf08b 100644
--- a/applications/luci-app-omcproxy/po/it/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/it/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/ja/omcproxy.po b/applications/luci-app-omcproxy/po/ja/omcproxy.po
index 6864da4a1..3bfe52442 100644
--- a/applications/luci-app-omcproxy/po/ja/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/ja/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/ko/omcproxy.po b/applications/luci-app-omcproxy/po/ko/omcproxy.po
index b2e16bdb8..3d0d2f10f 100644
--- a/applications/luci-app-omcproxy/po/ko/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/ko/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/mr/omcproxy.po b/applications/luci-app-omcproxy/po/mr/omcproxy.po
index 5920d7e64..2f1067a3b 100644
--- a/applications/luci-app-omcproxy/po/mr/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/mr/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/ms/omcproxy.po b/applications/luci-app-omcproxy/po/ms/omcproxy.po
index 063fdd672..7005e0fe6 100644
--- a/applications/luci-app-omcproxy/po/ms/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/ms/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/nb_NO/omcproxy.po b/applications/luci-app-omcproxy/po/nb_NO/omcproxy.po
index c558b3f4e..1157e6c8a 100644
--- a/applications/luci-app-omcproxy/po/nb_NO/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/nb_NO/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/pl/omcproxy.po b/applications/luci-app-omcproxy/po/pl/omcproxy.po
index 9655d5151..da5d68d2a 100644
--- a/applications/luci-app-omcproxy/po/pl/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/pl/omcproxy.po
@@ -11,67 +11,67 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr "Dodaj instancję"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr "Wbudowany IGMPv3 i proxy MLDv2"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr "Instancja proxy"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr "Zakres"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr "Skąd pochodzi multicast?"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr "Dokąd zmierza multicast?"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr "domyślna"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr "omcproxy"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/pt/omcproxy.po b/applications/luci-app-omcproxy/po/pt/omcproxy.po
index 645eb8f8e..f7af81ef3 100644
--- a/applications/luci-app-omcproxy/po/pt/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/pt/omcproxy.po
@@ -10,67 +10,67 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr "Adicionar instância"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr "Interface de downlink"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr "Proxy de IGMPv3 e MLDv2 incorporado"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr "Escopo mínimo de multicast ao proxy (afeta apenas o multicast IPv6)"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr "Instância de Proxy"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr "Escopo"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr "Interface de uplink"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr "De onde vem o multicast?"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr "Para onde vai o multicast?"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr "admin-local"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr "padrão"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr "global"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr "omcproxy"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr "organização-local"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr "domínio"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr "site-local"
diff --git a/applications/luci-app-omcproxy/po/pt_BR/omcproxy.po b/applications/luci-app-omcproxy/po/pt_BR/omcproxy.po
index cf3c19b95..6332276c5 100644
--- a/applications/luci-app-omcproxy/po/pt_BR/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/pt_BR/omcproxy.po
@@ -10,67 +10,68 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr "Adicionar instância"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr "Interface de downlink"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr "Proxy IGMPv3 e MLDv2 incorporado"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
-msgstr "Escopo mínimo de multicast para o proxy (afeta apenas o multicast IPv6)"
+msgstr ""
+"Escopo mínimo de multicast para o proxy (afeta apenas o multicast IPv6)"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr "Instância de proxy"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr "Escopo"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr "Interface uplink"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr "De onde vem o multicast?"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr "Para onde vai o multicast?"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr "administrador-local"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr "Padrão"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr "Global"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr "omcproxy"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr "organização-local"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr "realm"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr "site-local"
diff --git a/applications/luci-app-omcproxy/po/ro/omcproxy.po b/applications/luci-app-omcproxy/po/ro/omcproxy.po
index 02faaad13..abbcf5ba1 100644
--- a/applications/luci-app-omcproxy/po/ro/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/ro/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/ru/omcproxy.po b/applications/luci-app-omcproxy/po/ru/omcproxy.po
index 95902691e..52718b419 100644
--- a/applications/luci-app-omcproxy/po/ru/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/ru/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/sk/omcproxy.po b/applications/luci-app-omcproxy/po/sk/omcproxy.po
index e9ea0b971..65ba10932 100644
--- a/applications/luci-app-omcproxy/po/sk/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/sk/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/sv/omcproxy.po b/applications/luci-app-omcproxy/po/sv/omcproxy.po
index d11c12147..405d030b2 100644
--- a/applications/luci-app-omcproxy/po/sv/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/sv/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/templates/omcproxy.pot b/applications/luci-app-omcproxy/po/templates/omcproxy.pot
index ab19dfb26..0bbaa295b 100644
--- a/applications/luci-app-omcproxy/po/templates/omcproxy.pot
+++ b/applications/luci-app-omcproxy/po/templates/omcproxy.pot
@@ -1,67 +1,67 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
-msgstr ""
-\ No newline at end of file
+msgstr ""
diff --git a/applications/luci-app-omcproxy/po/tr/omcproxy.po b/applications/luci-app-omcproxy/po/tr/omcproxy.po
index bdc68f22f..ac64906eb 100644
--- a/applications/luci-app-omcproxy/po/tr/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/tr/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/uk/omcproxy.po b/applications/luci-app-omcproxy/po/uk/omcproxy.po
index e030564a3..80ca46077 100644
--- a/applications/luci-app-omcproxy/po/uk/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/uk/omcproxy.po
@@ -11,67 +11,67 @@ msgstr ""
 "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr "Додати реалізацію"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/vi/omcproxy.po b/applications/luci-app-omcproxy/po/vi/omcproxy.po
index 38e3b0d26..4ea7f3660 100644
--- a/applications/luci-app-omcproxy/po/vi/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/vi/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-omcproxy/po/zh-cn/omcproxy.po b/applications/luci-app-omcproxy/po/zh-cn/omcproxy.po
index ed47bcbb4..1b4bbadf9 100644
--- a/applications/luci-app-omcproxy/po/zh-cn/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/zh-cn/omcproxy.po
@@ -1,67 +1,67 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr "添加实例"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr "下行链路接口"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr "嵌入式IGMPv3和MLDv2组播代理(omcproxy)"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr "代理的最小范围（只影响IPv6的组播）"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr "代理实例"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr "范围"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr "上行链路接口"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr "组播数据来源"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr "组播代理去向"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr "管理本地范围"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr "默认"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr "全球范围"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr "组播代理"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr "机构本地范围"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr "保留"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
-msgstr "站点本地范围"
-\ No newline at end of file
+msgstr "站点本地范围"
diff --git a/applications/luci-app-omcproxy/po/zh_Hant/omcproxy.po b/applications/luci-app-omcproxy/po/zh_Hant/omcproxy.po
index 4c08fa2f3..9eda3bd89 100644
--- a/applications/luci-app-omcproxy/po/zh_Hant/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/zh_Hant/omcproxy.po
@@ -4,67 +4,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:14
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:27
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:31
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:22
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:9
-#: luasrc/controller/omcproxy.lua:11
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
+#: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:20
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:21
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/bg/opkg.po b/applications/luci-app-opkg/po/bg/opkg.po
index fbce3f6b7..0063408da 100644
--- a/applications/luci-app-opkg/po/bg/opkg.po
+++ b/applications/luci-app-opkg/po/bg/opkg.po
@@ -245,8 +245,8 @@ msgstr ""
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr ""
 
diff --git a/applications/luci-app-opkg/po/ca/opkg.po b/applications/luci-app-opkg/po/ca/opkg.po
index c64552035..9dc13b9c7 100644
--- a/applications/luci-app-opkg/po/ca/opkg.po
+++ b/applications/luci-app-opkg/po/ca/opkg.po
@@ -257,8 +257,8 @@ msgstr "Mida"
 msgid "Size (.ipk)"
 msgstr "Mida (.ipk)"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Programari"
 
diff --git a/applications/luci-app-opkg/po/cs/opkg.po b/applications/luci-app-opkg/po/cs/opkg.po
index a48ed5d45..51925cc3c 100644
--- a/applications/luci-app-opkg/po/cs/opkg.po
+++ b/applications/luci-app-opkg/po/cs/opkg.po
@@ -252,8 +252,8 @@ msgstr "Velikost"
 msgid "Size (.ipk)"
 msgstr "Velikost (.ipk)"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Software"
 
diff --git a/applications/luci-app-opkg/po/de/opkg.po b/applications/luci-app-opkg/po/de/opkg.po
index 8c38a25a2..0736001b3 100644
--- a/applications/luci-app-opkg/po/de/opkg.po
+++ b/applications/luci-app-opkg/po/de/opkg.po
@@ -257,8 +257,8 @@ msgstr "Größe"
 msgid "Size (.ipk)"
 msgstr "Größe (.ipk)"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Paketverwaltung"
 
diff --git a/applications/luci-app-opkg/po/el/opkg.po b/applications/luci-app-opkg/po/el/opkg.po
index 710042213..1c999739a 100644
--- a/applications/luci-app-opkg/po/el/opkg.po
+++ b/applications/luci-app-opkg/po/el/opkg.po
@@ -257,8 +257,8 @@ msgstr "Μέγεθος"
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Λογισμικό"
 
diff --git a/applications/luci-app-opkg/po/en/opkg.po b/applications/luci-app-opkg/po/en/opkg.po
index 69b761842..f4dcb3aad 100644
--- a/applications/luci-app-opkg/po/en/opkg.po
+++ b/applications/luci-app-opkg/po/en/opkg.po
@@ -246,8 +246,8 @@ msgstr ""
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr ""
 
diff --git a/applications/luci-app-opkg/po/es/opkg.po b/applications/luci-app-opkg/po/es/opkg.po
index 9a5b6cd2a..6fe08e576 100644
--- a/applications/luci-app-opkg/po/es/opkg.po
+++ b/applications/luci-app-opkg/po/es/opkg.po
@@ -255,8 +255,8 @@ msgstr "Tamaño"
 msgid "Size (.ipk)"
 msgstr "Tamaño (.ipk)"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Software"
 
diff --git a/applications/luci-app-opkg/po/fr/opkg.po b/applications/luci-app-opkg/po/fr/opkg.po
index 6bb9fd689..ab7546577 100644
--- a/applications/luci-app-opkg/po/fr/opkg.po
+++ b/applications/luci-app-opkg/po/fr/opkg.po
@@ -258,8 +258,8 @@ msgstr "Taille"
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Logiciels"
 
diff --git a/applications/luci-app-opkg/po/he/opkg.po b/applications/luci-app-opkg/po/he/opkg.po
index 31106b62e..6172ae7c6 100644
--- a/applications/luci-app-opkg/po/he/opkg.po
+++ b/applications/luci-app-opkg/po/he/opkg.po
@@ -253,8 +253,8 @@ msgstr ""
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "תוכנה"
 
diff --git a/applications/luci-app-opkg/po/hi/opkg.po b/applications/luci-app-opkg/po/hi/opkg.po
index 8b1b6bbb9..9ac127807 100644
--- a/applications/luci-app-opkg/po/hi/opkg.po
+++ b/applications/luci-app-opkg/po/hi/opkg.po
@@ -246,8 +246,8 @@ msgstr ""
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr ""
 
diff --git a/applications/luci-app-opkg/po/hu/opkg.po b/applications/luci-app-opkg/po/hu/opkg.po
index 1e6c1ed59..d9f2e0bb7 100644
--- a/applications/luci-app-opkg/po/hu/opkg.po
+++ b/applications/luci-app-opkg/po/hu/opkg.po
@@ -244,8 +244,8 @@ msgstr "Méret"
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Szoftver"
 
diff --git a/applications/luci-app-opkg/po/it/opkg.po b/applications/luci-app-opkg/po/it/opkg.po
index 1dcfe41ea..54964da91 100644
--- a/applications/luci-app-opkg/po/it/opkg.po
+++ b/applications/luci-app-opkg/po/it/opkg.po
@@ -257,8 +257,8 @@ msgstr "Dimensione"
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Software"
 
diff --git a/applications/luci-app-opkg/po/ja/opkg.po b/applications/luci-app-opkg/po/ja/opkg.po
index cc44ae6d6..ed28f6e4a 100644
--- a/applications/luci-app-opkg/po/ja/opkg.po
+++ b/applications/luci-app-opkg/po/ja/opkg.po
@@ -253,8 +253,8 @@ msgstr "サイズ"
 msgid "Size (.ipk)"
 msgstr "サイズ (.ipk)"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "ソフトウェア"
 
diff --git a/applications/luci-app-opkg/po/ko/opkg.po b/applications/luci-app-opkg/po/ko/opkg.po
index 6178e013d..b568b2fde 100644
--- a/applications/luci-app-opkg/po/ko/opkg.po
+++ b/applications/luci-app-opkg/po/ko/opkg.po
@@ -256,8 +256,8 @@ msgstr "Size"
 msgid "Size (.ipk)"
 msgstr "크기 (.ipk)"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "소프트웨어"
 
diff --git a/applications/luci-app-opkg/po/mr/opkg.po b/applications/luci-app-opkg/po/mr/opkg.po
index 748fb3e90..bf53f2077 100644
--- a/applications/luci-app-opkg/po/mr/opkg.po
+++ b/applications/luci-app-opkg/po/mr/opkg.po
@@ -246,8 +246,8 @@ msgstr ""
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr ""
 
diff --git a/applications/luci-app-opkg/po/ms/opkg.po b/applications/luci-app-opkg/po/ms/opkg.po
index 4bf0848fb..f2ced19ba 100644
--- a/applications/luci-app-opkg/po/ms/opkg.po
+++ b/applications/luci-app-opkg/po/ms/opkg.po
@@ -256,8 +256,8 @@ msgstr "Saiz"
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Perisian"
 
diff --git a/applications/luci-app-opkg/po/no/opkg.po b/applications/luci-app-opkg/po/no/opkg.po
index bc9797bb5..60ea00676 100644
--- a/applications/luci-app-opkg/po/no/opkg.po
+++ b/applications/luci-app-opkg/po/no/opkg.po
@@ -254,8 +254,8 @@ msgstr "Størrelse"
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Programvare"
 
diff --git a/applications/luci-app-opkg/po/pl/opkg.po b/applications/luci-app-opkg/po/pl/opkg.po
index 4fa4847e4..7add0eafe 100644
--- a/applications/luci-app-opkg/po/pl/opkg.po
+++ b/applications/luci-app-opkg/po/pl/opkg.po
@@ -255,8 +255,8 @@ msgstr "Rozmiar"
 msgid "Size (.ipk)"
 msgstr "Rozmiar (.ipk)"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Oprogramowanie"
 
diff --git a/applications/luci-app-opkg/po/pt-br/opkg.po b/applications/luci-app-opkg/po/pt-br/opkg.po
index 861025b38..80447a6d1 100644
--- a/applications/luci-app-opkg/po/pt-br/opkg.po
+++ b/applications/luci-app-opkg/po/pt-br/opkg.po
@@ -257,8 +257,8 @@ msgstr "Tamanho"
 msgid "Size (.ipk)"
 msgstr "Tamanho (.ipk)"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Software"
 
diff --git a/applications/luci-app-opkg/po/pt/opkg.po b/applications/luci-app-opkg/po/pt/opkg.po
index b231cfe40..d5cb5fd36 100644
--- a/applications/luci-app-opkg/po/pt/opkg.po
+++ b/applications/luci-app-opkg/po/pt/opkg.po
@@ -255,8 +255,8 @@ msgstr "Tamanho"
 msgid "Size (.ipk)"
 msgstr "Tamanho (.ipk)"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Software"
 
diff --git a/applications/luci-app-opkg/po/ro/opkg.po b/applications/luci-app-opkg/po/ro/opkg.po
index 81d0e6957..60144f0c3 100644
--- a/applications/luci-app-opkg/po/ro/opkg.po
+++ b/applications/luci-app-opkg/po/ro/opkg.po
@@ -257,8 +257,8 @@ msgstr "Marime"
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Software"
 
diff --git a/applications/luci-app-opkg/po/ru/opkg.po b/applications/luci-app-opkg/po/ru/opkg.po
index 9a5001616..30fe4817b 100644
--- a/applications/luci-app-opkg/po/ru/opkg.po
+++ b/applications/luci-app-opkg/po/ru/opkg.po
@@ -258,8 +258,8 @@ msgstr "Размер"
 msgid "Size (.ipk)"
 msgstr "Размер (.ipk)"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Программное обеспечение"
 
diff --git a/applications/luci-app-opkg/po/sk/opkg.po b/applications/luci-app-opkg/po/sk/opkg.po
index 38111646d..3ee8eeb0c 100644
--- a/applications/luci-app-opkg/po/sk/opkg.po
+++ b/applications/luci-app-opkg/po/sk/opkg.po
@@ -241,8 +241,8 @@ msgstr ""
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr ""
 
diff --git a/applications/luci-app-opkg/po/sv/opkg.po b/applications/luci-app-opkg/po/sv/opkg.po
index 6d9c29871..a69a4ca47 100644
--- a/applications/luci-app-opkg/po/sv/opkg.po
+++ b/applications/luci-app-opkg/po/sv/opkg.po
@@ -255,8 +255,8 @@ msgstr "Storlek"
 msgid "Size (.ipk)"
 msgstr "Storlek (.ipk)"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Mjukvara"
 
diff --git a/applications/luci-app-opkg/po/templates/opkg.pot b/applications/luci-app-opkg/po/templates/opkg.pot
index 0eef92a47..f38dce57c 100644
--- a/applications/luci-app-opkg/po/templates/opkg.pot
+++ b/applications/luci-app-opkg/po/templates/opkg.pot
@@ -233,8 +233,8 @@ msgstr ""
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr ""
 
diff --git a/applications/luci-app-opkg/po/tr/opkg.po b/applications/luci-app-opkg/po/tr/opkg.po
index a913924e0..4246b3ee4 100644
--- a/applications/luci-app-opkg/po/tr/opkg.po
+++ b/applications/luci-app-opkg/po/tr/opkg.po
@@ -250,8 +250,8 @@ msgstr "Boyut"
 msgid "Size (.ipk)"
 msgstr "Boyut (.ipk)"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Yazılım"
 
diff --git a/applications/luci-app-opkg/po/uk/opkg.po b/applications/luci-app-opkg/po/uk/opkg.po
index 7d6138d96..487493b04 100644
--- a/applications/luci-app-opkg/po/uk/opkg.po
+++ b/applications/luci-app-opkg/po/uk/opkg.po
@@ -254,8 +254,8 @@ msgstr "Розмір"
 msgid "Size (.ipk)"
 msgstr "Розмір (.ipk)"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Програмне забезпечення"
 
diff --git a/applications/luci-app-opkg/po/vi/opkg.po b/applications/luci-app-opkg/po/vi/opkg.po
index 6829a535b..9c18fb32d 100644
--- a/applications/luci-app-opkg/po/vi/opkg.po
+++ b/applications/luci-app-opkg/po/vi/opkg.po
@@ -257,8 +257,8 @@ msgstr "Dung lượng "
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "Phần mềm"
 
diff --git a/applications/luci-app-opkg/po/zh-cn/opkg.po b/applications/luci-app-opkg/po/zh-cn/opkg.po
index f902addcb..c2f2cf5c7 100644
--- a/applications/luci-app-opkg/po/zh-cn/opkg.po
+++ b/applications/luci-app-opkg/po/zh-cn/opkg.po
@@ -35,8 +35,9 @@ msgid ""
 "custom repository entries. The configuration in the other files may be "
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
-"以下列出了 <em>opkg</em> 所使用的各个配置文件。<em>opkg.conf</em> "
-"用于全局配置，<em>customfeeds.conf</em> 用于自定义仓库。其他配置文件的变更在<em>系统升级</em>时默认不被保留。"
+"以下列出了 <em>opkg</em> 所使用的各个配置文件。<em>opkg.conf</em> 用于全局配"
+"置，<em>customfeeds.conf</em> 用于自定义仓库。其他配置文件的变更在<em>系统升"
+"级</em>时默认不被保留。"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:599
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:644
@@ -250,8 +251,8 @@ msgstr "大小"
 msgid "Size (.ipk)"
 msgstr "大小（.ipk）"
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "软件包"
 
diff --git a/applications/luci-app-opkg/po/zh-tw/opkg.po b/applications/luci-app-opkg/po/zh-tw/opkg.po
index 5a841b0e8..9d6ef8641 100644
--- a/applications/luci-app-opkg/po/zh-tw/opkg.po
+++ b/applications/luci-app-opkg/po/zh-tw/opkg.po
@@ -255,8 +255,8 @@ msgstr "大小"
 msgid "Size (.ipk)"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:89
+#: applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json:3
 msgid "Software"
 msgstr "軟體"
 
diff --git a/modules/luci-base/po/bg/base.po b/modules/luci-base/po/bg/base.po
index bc7b99b4d..c3c9a6caa 100644
--- a/modules/luci-base/po/bg/base.po
+++ b/modules/luci-base/po/bg/base.po
@@ -33,6 +33,8 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -139,15 +141,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -157,7 +159,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr ""
@@ -182,12 +184,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
@@ -195,28 +198,28 @@ msgstr ""
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
@@ -332,6 +335,7 @@ msgstr ""
 msgid "Active DHCP Leases"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr ""
@@ -387,7 +391,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
@@ -400,11 +404,11 @@ msgstr ""
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -425,12 +429,13 @@ msgstr ""
 msgid "Address to access local relay bridge"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -459,17 +464,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -493,7 +498,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr ""
 
@@ -509,7 +514,7 @@ msgstr ""
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -680,7 +685,7 @@ msgstr ""
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr ""
 
@@ -688,11 +693,11 @@ msgstr ""
 msgid "Authorization Required"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -786,6 +791,7 @@ msgid "Backup"
 msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -794,10 +800,6 @@ msgstr ""
 msgid "Backup file list"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr ""
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -815,7 +817,7 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -835,7 +837,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr ""
 
@@ -1021,10 +1023,11 @@ msgid "Close list..."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr ""
 
@@ -1053,7 +1056,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr ""
@@ -1093,7 +1095,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr ""
 
@@ -1186,8 +1188,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr ""
 
@@ -1222,7 +1224,7 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr ""
 
@@ -1230,11 +1232,11 @@ msgstr ""
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1263,6 +1265,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1401,8 +1404,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr ""
 
@@ -1459,7 +1461,7 @@ msgstr ""
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
@@ -1493,7 +1495,7 @@ msgstr ""
 msgid "Distance to farthest network member in meters."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1501,15 +1503,15 @@ msgid ""
 "firewalls"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1529,11 +1531,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr ""
 
@@ -1541,7 +1543,7 @@ msgstr ""
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1682,7 +1684,7 @@ msgstr ""
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr ""
 
@@ -1802,11 +1804,11 @@ msgstr ""
 msgid "Ethernet Switch"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr ""
 
@@ -1815,6 +1817,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1891,7 +1900,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1900,11 +1909,11 @@ msgstr ""
 msgid "Filesystem"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr ""
 
@@ -1927,7 +1936,7 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr ""
 
@@ -1951,7 +1960,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2079,7 +2088,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2118,9 +2127,9 @@ msgstr ""
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr ""
@@ -2171,6 +2180,7 @@ msgstr ""
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2194,7 +2204,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2207,7 +2217,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr ""
 
@@ -2245,13 +2255,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
@@ -2319,6 +2329,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2329,8 +2341,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr ""
@@ -2400,6 +2410,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2491,7 +2502,7 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
@@ -2499,7 +2510,7 @@ msgstr ""
 msgid "Ignore interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr ""
 
@@ -2551,10 +2562,6 @@ msgstr ""
 msgid "Initscripts"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr ""
@@ -2616,7 +2623,7 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr ""
 
@@ -2671,9 +2678,9 @@ msgid ""
 "flash memory, please verify the image file!"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr ""
@@ -2694,8 +2701,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr ""
 
@@ -2771,16 +2778,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2807,11 +2815,11 @@ msgstr ""
 msgid "Limit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2835,7 +2843,7 @@ msgstr ""
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2863,15 +2871,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2883,12 +2891,12 @@ msgstr ""
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr ""
 
@@ -2896,10 +2904,6 @@ msgstr ""
 msgid "Load Average"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -2932,7 +2936,7 @@ msgstr ""
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -2945,31 +2949,31 @@ msgstr ""
 msgid "Local Time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr ""
 
@@ -2977,7 +2981,7 @@ msgstr ""
 msgid "Log output level"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr ""
 
@@ -2989,7 +2993,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr ""
 
@@ -3086,15 +3090,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
@@ -3234,6 +3238,7 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -3325,11 +3330,10 @@ msgstr ""
 msgid "Name of the new network"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3337,14 +3341,15 @@ msgstr ""
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr ""
 
@@ -3402,13 +3407,13 @@ msgstr ""
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr ""
@@ -3454,7 +3459,7 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3496,11 +3501,11 @@ msgstr ""
 msgid "Notice"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3547,7 +3552,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
@@ -3722,7 +3727,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr ""
 
@@ -3950,8 +3955,9 @@ msgstr ""
 msgid "Physical Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4027,7 +4033,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4040,7 +4046,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr ""
 
@@ -4097,7 +4103,7 @@ msgstr ""
 msgid "Quality"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4164,7 +4170,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4174,7 +4180,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr ""
 
@@ -4182,12 +4188,13 @@ msgstr ""
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr ""
 
@@ -4315,7 +4322,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4361,11 +4368,11 @@ msgstr ""
 msgid "Reset to defaults"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr ""
 
@@ -4417,7 +4424,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4443,12 +4450,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr ""
 
@@ -4484,6 +4492,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4501,6 +4510,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4545,6 +4555,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr ""
 
@@ -4584,7 +4595,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr ""
 
@@ -4597,7 +4608,7 @@ msgstr ""
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr ""
 
@@ -4688,7 +4699,7 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4701,11 +4712,11 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr ""
 
@@ -4806,6 +4817,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4817,11 +4829,11 @@ msgstr ""
 msgid "Static IPv6 Routes"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr ""
 
@@ -4831,7 +4843,7 @@ msgstr ""
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4842,10 +4854,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr ""
 
@@ -4855,7 +4867,7 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr ""
 
@@ -4868,11 +4880,11 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4881,7 +4893,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr ""
 
@@ -4929,15 +4941,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr ""
 
@@ -4953,11 +4966,11 @@ msgstr ""
 msgid "TCP:"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr ""
 
@@ -5175,7 +5188,8 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5185,9 +5199,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5206,7 +5220,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5239,7 +5253,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5307,14 +5321,15 @@ msgstr ""
 msgid "Total Available"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr ""
 
@@ -5542,7 +5557,7 @@ msgstr ""
 msgid "Uptime"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr ""
 
@@ -5653,7 +5668,7 @@ msgstr ""
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5702,7 +5717,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5780,10 +5795,6 @@ msgid ""
 "and ad-hoc mode) to be installed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr ""
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5818,9 +5829,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr ""
 
@@ -5868,7 +5879,7 @@ msgstr ""
 msgid "Wireless network is enabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
@@ -5894,9 +5905,9 @@ msgid ""
 "scripts like \"network\", your device might become inaccessible!</strong>"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -5918,7 +5929,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr ""
 
@@ -6007,13 +6018,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6065,7 +6077,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 
@@ -6102,16 +6114,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr ""
@@ -6189,8 +6201,9 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6218,6 +6231,7 @@ msgid "untagged"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6230,6 +6244,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6258,6 +6273,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6317,6 +6333,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6342,6 +6361,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index 9bf0b657f..2569c441f 100644
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -43,6 +43,8 @@ msgstr "(finestra de %d minuts, interval de %d segons)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -149,15 +151,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "Port de consulta <abbr title=\"Domain Name System\">DNS</abbr> "
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "Port del servidor <abbr title=\"Domain Name System\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -169,7 +171,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Adreça <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -196,12 +198,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Passarel·la <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuració dels <abbr title=\"Light Emitting Diode\">LED</abbr>s"
 
@@ -209,16 +212,16 @@ msgstr "Configuració dels <abbr title=\"Light Emitting Diode\">LED</abbr>s"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Nom <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Adreça <abbr title=\"Media Access Control\">MAC</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -226,7 +229,7 @@ msgstr ""
 "Arrendaments de <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> <abbr title=\"màxims\">max.</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -234,7 +237,7 @@ msgstr ""
 "Mida <abbr title=\"màxima\">màx.</abbr> de paquet <abbr title=\"Extension "
 "Mechanisms for Domain Name System\">EDNS0</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "Consultes concurrents <abbr title=\"màximes\">max.</abbr>"
 
@@ -355,6 +358,7 @@ msgstr "Connexions actives"
 msgid "Active DHCP Leases"
 msgstr "Arrendaments DHCP actius"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Arrendaments DHCPv6 actius"
@@ -410,7 +414,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "Afegeix el sufix de domini local als noms servits des dels fitxers de hosts"
@@ -424,11 +428,11 @@ msgstr "Afegeix una interfície nova..."
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Fitxers de Hosts addicionals"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -449,12 +453,13 @@ msgstr "Adreça"
 msgid "Address to access local relay bridge"
 msgstr "Adreça per accedir al relay bridge local"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administració"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -483,17 +488,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -519,7 +524,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr "Permet només les llistades"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Permetre el localhost"
 
@@ -537,7 +542,7 @@ msgstr "Accés d'administrador amb contrasenya"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Permetre l'accés de l'usurari <em>root</em> amb contrasenya"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr "Permet respostes del rang 127.0.0.0/8, p.e. per serveis RBL"
@@ -708,7 +713,7 @@ msgstr "Autenticació"
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Autoritzada"
 
@@ -716,11 +721,11 @@ msgstr "Autoritzada"
 msgid "Authorization Required"
 msgstr "Es requereix autenticació"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -814,6 +819,7 @@ msgid "Backup"
 msgstr "Còpia de seguretat"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Còpia de seguretat i microprogramari"
 
@@ -822,10 +828,6 @@ msgstr "Còpia de seguretat i microprogramari"
 msgid "Backup file list"
 msgstr "Llista de còpies de seguretat"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Adreça mal especificada!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -846,7 +848,7 @@ msgstr ""
 "en els fitxers de configuració canviats i marcats per l'opkg, fitxers base "
 "essencials i els patrons de còpia de seguretat definits per l'usuari."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -866,7 +868,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr "Velocitat de bits"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Substitució dels dominis NX falsos"
 
@@ -1060,10 +1062,11 @@ msgid "Close list..."
 msgstr "Tanca la llista..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "S’estan recollint dades…"
 
@@ -1092,7 +1095,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Configuració"
@@ -1132,7 +1134,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Connexions"
 
@@ -1227,8 +1229,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr "Servidor DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP i DNS"
 
@@ -1263,7 +1265,7 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "Reenviaments DNS"
 
@@ -1271,11 +1273,11 @@ msgstr "Reenviaments DNS"
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1304,6 +1306,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1442,8 +1445,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Diagnòstics"
 
@@ -1502,7 +1504,7 @@ msgstr "Inhabilitat"
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Descarta les respostes RFC1918 des de dalt"
 
@@ -1536,7 +1538,7 @@ msgstr "Optimització de distància"
 msgid "Distance to farthest network member in meters."
 msgstr "Distància al membre de la xarxa més allunyat en metres."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1548,15 +1550,15 @@ msgstr ""
 "\">DNS</abbr> per tallafocs <abbr title=\"Network Address Translation\">NAT</"
 "abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1576,11 +1578,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Es requereix un domini"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr ""
 
@@ -1588,7 +1590,7 @@ msgstr ""
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1734,7 +1736,7 @@ msgstr "Habilita el client NTP"
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Habilita el servidor TFTP"
 
@@ -1854,11 +1856,11 @@ msgstr "Adaptador Ethernet"
 msgid "Ethernet Switch"
 msgstr "Commutador Ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr ""
 
@@ -1867,6 +1869,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr "S’espera: %s"
 
@@ -1943,7 +1952,7 @@ msgstr "No hi ha accés al fitxer"
 msgid "Filename"
 msgstr "Nom de fitxer"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "Nom de fitxer de la imatge d'inici que es publica als clients"
 
@@ -1952,11 +1961,11 @@ msgstr "Nom de fitxer de la imatge d'inici que es publica als clients"
 msgid "Filesystem"
 msgstr "Sistema de fitxers"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Filtra privat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Filtra els no útils"
 
@@ -1979,7 +1988,7 @@ msgstr "Troba i uneix-te a la xarxa"
 msgid "Finish"
 msgstr "Acaba"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Tallafocs"
 
@@ -2003,7 +2012,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Versió de microprogramari"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2131,7 +2140,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2172,9 +2181,9 @@ msgstr "Configuració global"
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Vés a la configuració de contrasenya"
@@ -2228,6 +2237,7 @@ msgstr ""
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2251,7 +2261,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2264,7 +2274,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Noms de màquina"
 
@@ -2302,13 +2312,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2376,6 +2386,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2386,8 +2398,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2457,6 +2467,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2554,7 +2565,7 @@ msgstr ""
 "es pot accedir al dispositiu d'intercanvi amb unes taxes tan altes com les "
 "de la <abbr title=\"Random Access Memory\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignora <code>/etc/hosts</code>"
 
@@ -2562,7 +2573,7 @@ msgstr "Ignora <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Ignora la interfície"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Ignora el fitxer de resolució"
 
@@ -2614,10 +2625,6 @@ msgstr "Script d'inici"
 msgid "Initscripts"
 msgstr "Scripts d'inici"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Instal·la extensions de protocol"
@@ -2679,7 +2686,7 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Interfícies"
 
@@ -2737,9 +2744,9 @@ msgstr ""
 "Sembla que intentes actualitzar una imatge que no hi cap a la memòria flaix, "
 "si us plau verifica el fitxer d'imatge!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "Es requereix JavaScript!"
@@ -2760,8 +2767,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Registre del nucli"
 
@@ -2837,16 +2844,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Fitxer d'arrendament"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2873,11 +2881,11 @@ msgstr "Llegenda:"
 msgid "Limit"
 msgstr "Límit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2901,7 +2909,7 @@ msgstr ""
 msgid "Link On"
 msgstr "Enllaç actiu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2929,15 +2937,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2951,12 +2959,12 @@ msgstr ""
 "Habilita el servei en totes les interfícies o, si no se n'especifica cap, en "
 "totes"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Càrrega"
 
@@ -2964,10 +2972,6 @@ msgstr "Càrrega"
 msgid "Load Average"
 msgstr "Càrrega mitjana"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "S’està carregant"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -3000,7 +3004,7 @@ msgstr "Adreça IPv4 local"
 msgid "Local IPv6 address"
 msgstr "Adreça IPv6 local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -3013,31 +3017,31 @@ msgstr "Inici local"
 msgid "Local Time"
 msgstr "Hora local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Domini local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Servidor local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Localitza les peticions"
 
@@ -3045,7 +3049,7 @@ msgstr "Localitza les peticions"
 msgid "Log output level"
 msgstr "Nivell de sortida de registre"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Registra les peticions"
 
@@ -3057,7 +3061,7 @@ msgstr "Registre"
 msgid "Login"
 msgstr "Entra"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Surt"
 
@@ -3154,15 +3158,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
@@ -3302,6 +3306,7 @@ msgstr "Punt de muntatge"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Punts de muntatge"
 
@@ -3395,11 +3400,10 @@ msgstr "Nom"
 msgid "Name of the new network"
 msgstr "Nom de la nova xarxa"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navegació"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3407,14 +3411,15 @@ msgstr "Navegació"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Xarxa"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Utilitats de xarxa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Imatge d'inici de xarxa"
 
@@ -3472,13 +3477,13 @@ msgstr "No hi ha informació disponible"
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Sense memòria cau negativa"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "No hi ha cap contrasenya establerta!"
@@ -3524,7 +3529,7 @@ msgstr "Soroll:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3566,11 +3571,11 @@ msgstr ""
 msgid "Notice"
 msgstr "Avís"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3617,7 +3622,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "Cal especificar o el nom de host o l'adreça MAC!"
 
@@ -3792,7 +3797,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Visió de conjunt"
 
@@ -4020,8 +4025,9 @@ msgstr "Velocitat física:"
 msgid "Physical Settings"
 msgstr "Ajusts físics"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4097,7 +4103,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4110,7 +4116,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Processos"
 
@@ -4167,7 +4173,7 @@ msgstr ""
 msgid "Quality"
 msgstr "Calidad"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4234,7 +4240,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4246,7 +4252,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Gràfiques en temps real"
 
@@ -4254,12 +4260,13 @@ msgstr "Gràfiques en temps real"
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reinicia"
 
@@ -4387,7 +4394,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4433,11 +4440,11 @@ msgstr "Reinicia els comptadors"
 msgid "Reset to defaults"
 msgstr "Reestableix els valors per defecte"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr ""
 
@@ -4489,7 +4496,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Directori arrel dels fitxers servits per TFTP"
 
@@ -4515,12 +4522,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Contrasenya de l'encaminador"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Rutes"
 
@@ -4558,6 +4566,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Accés SSH"
 
@@ -4575,6 +4584,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Claus SSH"
 
@@ -4619,6 +4629,7 @@ msgstr "Escaneja"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Tasques programades"
 
@@ -4658,7 +4669,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Ajusts de servidor"
 
@@ -4671,7 +4682,7 @@ msgstr "Nom de servei"
 msgid "Service Type"
 msgstr "Tipus de servei"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Serveis"
 
@@ -4762,7 +4773,7 @@ msgstr "Senyal:"
 msgid "Size"
 msgstr "Mida"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4775,11 +4786,11 @@ msgstr ""
 msgid "Skip"
 msgstr "Salta"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Salta al contingut"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Salta a la navegació"
 
@@ -4880,6 +4891,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Arrencada"
 
@@ -4891,11 +4903,11 @@ msgstr "Rutes IPv4 estàtiques"
 msgid "Static IPv6 Routes"
 msgstr "Rutes IPv6 estàtiques"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Leases estàtics"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Rutes estàtiques"
 
@@ -4905,7 +4917,7 @@ msgstr "Rutes estàtiques"
 msgid "Static address"
 msgstr "Adreça estàtica"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4916,10 +4928,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Estat"
 
@@ -4929,7 +4941,7 @@ msgstr "Estat"
 msgid "Stop"
 msgstr "Atura"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Ordre estricte"
 
@@ -4942,11 +4954,11 @@ msgstr ""
 msgid "Submit"
 msgstr "Envia"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4955,7 +4967,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Commutador"
 
@@ -5003,15 +5015,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr "Sincronitza amb el navegador"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistema"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Registre del sistema"
 
@@ -5027,11 +5040,11 @@ msgstr "Mida de la memòria intermèdia per al registre del sistema"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Ajusts TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "Arrel del servidor TFTP"
 
@@ -5264,7 +5277,8 @@ msgstr ""
 "La imatge pujada no conté un format suportat. Assegura't de triar el format "
 "d'imatge genèric per la teva plataforma."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5274,9 +5288,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5297,7 +5311,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5333,7 +5347,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5411,14 +5425,15 @@ msgstr ""
 msgid "Total Available"
 msgstr "Total disponible"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Rastre de ruta"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Trànsit"
 
@@ -5646,7 +5661,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Temps en marxa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Fes servir <code>/etc/ethers</code>"
 
@@ -5757,7 +5772,7 @@ msgstr ""
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5806,7 +5821,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr "VLANs en %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5886,10 +5901,6 @@ msgstr ""
 "La xifratge WPA requereix que sigui instal·lat el wpa_supplicant (pel mode "
 "client) o el hostapd (pels modes AP i ad hoc)."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "S’està esperant que l’ordre s’acabi…"
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "Esperant el dispositiu..."
@@ -5924,9 +5935,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Sense fils"
 
@@ -5974,7 +5985,7 @@ msgstr "La xarxa sense fil està inhabilitada"
 msgid "Wireless network is enabled"
 msgstr "La xarxa sense fils està habilitada"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Escriure les peticions DNS rebudes al registre del sistema"
 
@@ -6004,9 +6015,9 @@ msgstr ""
 "Si desactives scripts d'inici necessaris com el \"network\", el teu "
 "dispositiu pot resultar inaccessible!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6030,7 +6041,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "qualsevol"
 
@@ -6120,13 +6131,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "caducat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6180,7 +6192,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "fitxer <abbr title=\"Domain Name System\">DNS</abbr> local"
 
@@ -6217,16 +6229,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "parat"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "engegat"
@@ -6304,8 +6316,9 @@ msgstr ""
 msgid "unknown"
 msgstr "desconegut"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6333,6 +6346,7 @@ msgid "untagged"
 msgstr "sense etiquetar"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6345,6 +6359,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6373,6 +6388,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6432,6 +6448,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6457,6 +6476,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6504,6 +6524,15 @@ msgstr "sí"
 msgid "« Back"
 msgstr "« Enrere"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Adreça mal especificada!"
+
+#~ msgid "Loading"
+#~ msgstr "S’està carregant"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "S’està esperant que l’ordre s’acabi…"
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Assigna interfícies..."
 
diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po
index 47dab6292..19fbd6399 100644
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -40,6 +40,8 @@ msgstr "(%d minutové okno, %d sekundový interval)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -146,15 +148,15 @@ msgstr "Časový limit opakování 802.11w"
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "port dotazů <abbr title=\"Domain Name System\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "port serveru <abbr title=\"Domain Name System\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -166,7 +168,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protokol Verze 4\">IPv4</abbr>-Adresa"
@@ -192,7 +194,7 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protokol Verze 6\">IPv6</abbr>-Brána"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 "<abbr title=\"Internetový Protokol Verze 6\">IPv6</abbr>-Suffix "
@@ -200,6 +202,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Konfigurace"
 
@@ -207,16 +210,16 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Konfigurace"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Název"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Adresa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -224,15 +227,15 @@ msgstr ""
 "<abbr title=\"Maximální\">Nejvyšší</abbr>počet <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr> výpůjček"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
 msgstr ""
-"<abbr title=\"Maximální\">Největší</abbr>povolená velikost <abbr title=\""
-"Extension Mechanisms for Domain Name System\">EDNS0</abbr> packetů"
+"<abbr title=\"Maximální\">Největší</abbr>povolená velikost <abbr title="
+"\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> packetů"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"Maximální\">Nejvyšší</abbr>počet souběžných dotazů"
 
@@ -357,6 +360,7 @@ msgstr "Aktivní spojení"
 msgid "Active DHCP Leases"
 msgstr "Aktivní propůjčené DHCP adresy (leases)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Aktivní propůjčené DHCPv6 adresy (leases)"
@@ -412,7 +416,7 @@ msgstr "Přidat instanci"
 msgid "Add key"
 msgstr "Přidat klíč"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Přidat lokální koncovku k doménovým jménům ze souboru hosts"
 
@@ -425,11 +429,11 @@ msgstr "Přidat rozhraní..."
 msgid "Add peer"
 msgstr "Přidat protistranu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Dodatečné Hosts soubory"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "Soubor s dalšími servery"
 
@@ -450,12 +454,13 @@ msgstr "Adresa"
 msgid "Address to access local relay bridge"
 msgstr "Adresa pro přístup k místnímu relay bridge"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Správa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -484,17 +489,17 @@ msgstr "Alias rozhraní"
 msgid "Alias of \"%s\""
 msgstr "Alias \"%s\""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr "Všechny servery"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr "Postupné přidělování adres IP od nejnižší dostupné adresy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr "Postupné přidělování adres IP"
 
@@ -520,7 +525,7 @@ msgstr "Povolit starší rychlosti 802.11b"
 msgid "Allow listed only"
 msgstr "Povolit pouze uvedené"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Povolit localhost"
 
@@ -538,7 +543,7 @@ msgstr "Povolit přihlašovaní root účtu pomocí hesla"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Povolit <em>root</em> účtu přihlášení bez nastaveného hesla"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr "Povolit upstream odpovědi na 127.0.0.0/8 rozsah, např. pro RBL služby"
@@ -678,7 +683,8 @@ msgstr "Architektura"
 #: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
-msgstr "Přiřadit zadanou délku každého veřejného IPv6 prefixu k tomuto rozhraní"
+msgstr ""
+"Přiřadit zadanou délku každého veřejného IPv6 prefixu k tomuto rozhraní"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
 #: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
@@ -700,7 +706,8 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:153
 msgid "Attempt to enable configured mount points for attached devices"
-msgstr "Pokusit se povolit nakonfigurované přípojné body pro připojená zařízení"
+msgstr ""
+"Pokusit se povolit nakonfigurované přípojné body pro připojená zařízení"
 
 #: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
 #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
@@ -717,7 +724,7 @@ msgstr "Autentizace"
 msgid "Authentication Type"
 msgstr "Typ autentizace"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Autoritativní"
 
@@ -725,11 +732,11 @@ msgstr "Autoritativní"
 msgid "Authorization Required"
 msgstr "Vyžadována autorizace"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -825,6 +832,7 @@ msgid "Backup"
 msgstr "Zálohovat"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Zálohovat / nahrát firmware"
 
@@ -833,10 +841,6 @@ msgstr "Zálohovat / nahrát firmware"
 msgid "Backup file list"
 msgstr "Seznam souborů k zálohování"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Zadána neplatná adresa!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -857,7 +861,7 @@ msgstr ""
 "souborů označených opkg, nezbyných systémových souborů a souborů "
 "vyhovujících uživatelem určeným vzorům."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -877,7 +881,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr "Přenosová rychlost"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Přepíše falešnou hodnotu NX Domény"
 
@@ -1077,10 +1081,11 @@ msgid "Close list..."
 msgstr "Zavřít seznam..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Probíhá sběr dat..."
 
@@ -1114,7 +1119,6 @@ msgstr ""
 "provozem."
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Nastavení"
@@ -1154,7 +1158,7 @@ msgstr "Pokus o připojení selhal"
 msgid "Connection lost"
 msgstr "Spojení ztraceno"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Připojení"
 
@@ -1254,8 +1258,8 @@ msgstr "DAE-Secret"
 msgid "DHCP Server"
 msgstr "DHCP server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP a DNS"
 
@@ -1290,7 +1294,7 @@ msgstr "Služba DHCPv6"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "Přeposílání DNS"
 
@@ -1298,11 +1302,11 @@ msgstr "Přeposílání DNS"
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr "DNSSEC kontrolovat nepodepsané"
 
@@ -1331,6 +1335,7 @@ msgstr "Režim linky DSL"
 msgid "DTIM Interval"
 msgstr "Interval DTIM"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1471,8 +1476,7 @@ msgstr "Zařízení není dostupné!"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "Zařízení není dostupné! Pokračuje čekání na zařízení..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Diagnostika"
 
@@ -1531,7 +1535,7 @@ msgstr "Zakázáno"
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Zrušit spojení při nízkém počtu ACK potvrzení"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Vyřadit upstream RFC1918 odpovědi"
 
@@ -1565,7 +1569,7 @@ msgstr "Optimalizace na vzdálenost"
 msgid "Distance to farthest network member in meters."
 msgstr "Vzdálenost nejodlehlejšího člena sítě v metrech."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1577,17 +1581,17 @@ msgstr ""
 "forwarderu pro použití v <abbr title=\"Network Address Translation\">NAT</"
 "abbr> firewallech"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr "Necachovat negativní odpovědi (např. pro neexistující domény)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Nepřeposílat požadavky, které nemohou být zodpovězeny veřejnými jmennými "
 "servery"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Nepřeposílat reverzní dotazy na místní sítě"
 
@@ -1607,11 +1611,11 @@ msgstr "Opravdu chcete smazat veškeré nastavení?"
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr "Opravdu chcete rekurzivně smazat adresář \"%s\"?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Vyžadována doména"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Whitelist domén"
 
@@ -1619,7 +1623,7 @@ msgstr "Whitelist domén"
 msgid "Don't Fragment"
 msgstr "Nefragmentovat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1771,7 +1775,7 @@ msgstr "Povolit NTP klienta"
 msgid "Enable Single DES"
 msgstr "Povolit Single DES"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Povolit TFTP server"
 
@@ -1893,11 +1897,11 @@ msgstr "Ethernetový adaptér"
 msgid "Ethernet Switch"
 msgstr "Ethernetový switch"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr "Vyloučit rozhraní"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Rozšířit hostitele"
 
@@ -1906,6 +1910,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr "Očekávána šestnáctková hodnota"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr "Očekáváno: %s"
 
@@ -1987,7 +1998,7 @@ msgstr "Soubor není přístupný"
 msgid "Filename"
 msgstr "Název souboru"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "Název souboru s bootovacím obrazem oznamovaný klientům"
 
@@ -1996,11 +2007,11 @@ msgstr "Název souboru s bootovacím obrazem oznamovaný klientům"
 msgid "Filesystem"
 msgstr "Souborový systém"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Filtrovat soukromé"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Filtrovat nepotřebné"
 
@@ -2025,7 +2036,7 @@ msgstr "Vyhledat a připojit síť"
 msgid "Finish"
 msgstr "Dokončit"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -2049,7 +2060,7 @@ msgstr "Soubor firmwaru"
 msgid "Firmware Version"
 msgstr "Verze firmwaru"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Pevný zdrojový port pro odchozí DNS dotazy"
 
@@ -2180,7 +2191,7 @@ msgstr "Adresa brány je neplatná"
 msgid "Gateway metric"
 msgstr "Metrika brány"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2219,9 +2230,9 @@ msgstr "Globální nastavení"
 msgid "Global network options"
 msgstr "Globální možnosti sítě"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Přejít na nastavení hesla..."
@@ -2274,6 +2285,7 @@ msgstr "Skrývat <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgid "Hide empty chains"
 msgstr "Skrýt prázdné řetězy"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2298,7 +2310,7 @@ msgid "Host-Uniq tag content"
 msgstr "Obsah značky Host-Uniq"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2311,7 +2323,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "Jméno hostitele odesílané při vyžádání DHCP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Jména hostitelů"
 
@@ -2349,13 +2361,13 @@ msgstr "Neplatná IP adresa"
 msgid "IP address is missing"
 msgstr "Chybí IP adresa"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2423,6 +2435,8 @@ msgstr "IPv4-in-IPv4 (RFC2003)"
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr "IPv4/IPv6 (obojí - výchozí IPv4)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2433,8 +2447,6 @@ msgstr "IPv4/IPv6 (obojí - výchozí IPv4)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2504,6 +2516,7 @@ msgstr "IPv6 směrovaný prefix"
 msgid "IPv6 suffix"
 msgstr "IPv6 suffix"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2601,7 +2614,7 @@ msgstr ""
 "přístup na odkládací zařízení je řádově pomalejší, než přístup do paměti "
 "<abbr title=\"Random Access Memory\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorovat <code>/etc/hosts</code>"
 
@@ -2609,7 +2622,7 @@ msgstr "Ignorovat <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Ignorovat rozhraní"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Ignorovat resolv soubor"
 
@@ -2663,10 +2676,6 @@ msgstr "Initskript"
 msgid "Initscripts"
 msgstr "Initskripty"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr "Nainstalujte balíček iputils-traceroute6 pro IPv6 traceroute"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Instalovat protokolové rozšíření…"
@@ -2728,7 +2737,7 @@ msgstr "Rozhraní není přítomné nebo je dosud nepřipojeno."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Síťová rozhraní"
 
@@ -2787,9 +2796,9 @@ msgstr ""
 "Vypadadá to, že se pokoušíte zapsat obraz, který se nevejde do flash paměti. "
 "Prosím ověřte soubor s obrazem!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "Je vyžadován JavaScript!"
@@ -2810,8 +2819,8 @@ msgstr "Připojování k síti: %q"
 msgid "Keep settings and retain the current configuration"
 msgstr "Zachovat nastavení a ponechat aktuální konfiguraci"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Záznam kernelu"
 
@@ -2887,16 +2896,17 @@ msgstr "Odezva"
 msgid "Leaf"
 msgstr "Leaf"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "Doba zapůjčení"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Soubor zápůjček"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2923,13 +2933,13 @@ msgstr "Legenda:"
 msgid "Limit"
 msgstr "Limit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 #, fuzzy
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 "Omezit obsluhování DNS na rozhraní podsítí, na kterých je DNS poskytováno."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "Omezit naslouchání na tato rozhraní a zpětnou smyčku."
 
@@ -2953,7 +2963,7 @@ msgstr "Line Uptime"
 msgid "Link On"
 msgstr "Odkaz na"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2997,15 +3007,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr "Seznam SSH klíčů pro autentizaci"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Seznam domén, pro které povolit odpovědi podle RFC1918"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "Seznam hostitelů, kteří udávají falešné hodnoty NX domén"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr "Naslouchající rozhraní"
 
@@ -3018,12 +3028,12 @@ msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 "Poslouchat pouze na daném rozhraní, nebo pokud není specifikováno, na všech"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Port pro příchozí dotazy DNS"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Zátěž"
 
@@ -3031,10 +3041,6 @@ msgstr "Zátěž"
 msgid "Load Average"
 msgstr "Průměrná zátěž"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Načítání"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr "Načítání obsahu adresáře…"
@@ -3067,7 +3073,7 @@ msgstr "Místní IPv4 adresa"
 msgid "Local IPv6 address"
 msgstr "Místní IPv6 adresa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr "Pouze lokální služba"
 
@@ -3080,11 +3086,11 @@ msgstr "Místní startup"
 msgid "Local Time"
 msgstr "Místní čas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Místní doména"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 #, fuzzy
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
@@ -3093,16 +3099,16 @@ msgstr ""
 "Specifikace místní domény. Jména shodná s touto doménou nikdy nebudou "
 "přesměrována ani rozlušťována pomocí DHCP nebo souborů hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 "Přípona místní domény, připojená za názvy DHCP jmen a záznamů v souboru hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Místní server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3110,7 +3116,7 @@ msgstr ""
 "Lokalizovat jméno v závislosti na dotazující se podsíti, pokud bylo nalezeno "
 "více IP adres"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Lokalizační dotazy"
 
@@ -3118,7 +3124,7 @@ msgstr "Lokalizační dotazy"
 msgid "Log output level"
 msgstr "Úroveň logování"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Dotazy pro logování"
 
@@ -3130,7 +3136,7 @@ msgstr "Protokolování"
 msgid "Login"
 msgstr "Přihlásit"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Odhlásit"
 
@@ -3230,15 +3236,15 @@ msgstr "Max. dosažitelná rychlost přenosu dat (ATTNDR)"
 msgid "Maximum allowed Listen Interval"
 msgstr "Maximální povolený naslouchací interval"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Nejvyšší povolené množství aktivních DHCP zápůjček"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Nejvyšší povolené množství souběžných DNS dotazů"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Nejvyšší povolená velikost EDNS.0 UDP paketů"
 
@@ -3378,6 +3384,7 @@ msgstr "Přípojný bod"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Přípojné body"
 
@@ -3472,11 +3479,10 @@ msgstr "Název"
 msgid "Name of the new network"
 msgstr "Název nové sítě"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navigace"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3484,14 +3490,15 @@ msgstr "Navigace"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Síť"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Síťové nástroje"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Síťový bootovací obraz"
 
@@ -3549,13 +3556,13 @@ msgstr "Údaje nejsou k dispozici"
 msgid "No matching prefix delegation"
 msgstr "Žádný vhodný delegovaný prefix"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Žádná negativní mezipaměť"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Žádné heslo!"
@@ -3601,7 +3608,7 @@ msgstr "Šum:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "Nepreemptivní CRC chyby (CRC_P)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr "Bez zástupných znaků"
 
@@ -3643,11 +3650,11 @@ msgstr "Není podporováno"
 msgid "Notice"
 msgstr "Oznámení"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr "Počet záznamů v mezipaměti DNS (max. 10 000, 0 bez mezipaměťi)"
 
@@ -3695,7 +3702,7 @@ msgstr "Link-local trasa"
 msgid "On-State Delay"
 msgstr "Zapnutí prodlevy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "Jedno jméno nebo mac adresa, musí být zadáno!"
 
@@ -3760,8 +3767,8 @@ msgid ""
 "for the interface."
 msgstr ""
 "Volitelné. Povolené hodnoty: 'eui64', 'random', pevné hodnoty jako '::1' "
-"nebo '::1:2'. Pokud je z delegovacího serveru přijat IPv6 prefix (např. \""
-"a:b:c:d::\"), použijte k vytvoření IPv6 adresy (\"a:b:c:d::1\") pro dané "
+"nebo '::1:2'. Pokud je z delegovacího serveru přijat IPv6 prefix (např. \"a:"
+"b:c:d::\"), použijte k vytvoření IPv6 adresy (\"a:b:c:d::1\") pro dané "
 "rozhraní suffix (např. '::1')."
 
 #: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
@@ -3886,7 +3893,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr "Přepsat tabulku, používanou pro vnitřní cesty"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Přehled"
 
@@ -4114,8 +4121,9 @@ msgstr "Fyzická rychlost:"
 msgid "Physical Settings"
 msgstr "Fyzické nastavení"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ping"
 
@@ -4193,7 +4201,7 @@ msgstr ""
 "Po takovém množství LCP echo selhání předpokládám, že peer je mrtvý. "
 "Použijte 0 pro ignorování chyb"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr "Zabránit naslouchání na těchto rozhraních."
 
@@ -4206,7 +4214,7 @@ msgid "Private Key"
 msgstr "Soukromý klíč"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Procesy"
 
@@ -4267,13 +4275,13 @@ msgstr "Mobilní QMI"
 msgid "Quality"
 msgstr "Kvalita"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
-"Dotazovat se všech dostupných nadřazených <abbr title=\"Domain Name System\""
-">DNS</abbr> serverů"
+"Dotazovat se všech dostupných nadřazených <abbr title=\"Domain Name System"
+"\">DNS</abbr> serverů"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1395
 msgid "R0 Key Lifetime"
@@ -4338,7 +4346,7 @@ msgstr ""
 "Nezpracované šestnáctkové bajty. Ponechte prázdné, pokud to poskytovatel "
 "internetu nevyžaduje"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4350,7 +4358,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "Opravdu prohodit protokol?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Grafy v reálném čase"
 
@@ -4358,12 +4366,13 @@ msgstr "Grafy v reálném čase"
 msgid "Reassociation Deadline"
 msgstr "Termín reasociace"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "Opětovné nastavení ochrany"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reboot"
 
@@ -4498,7 +4507,7 @@ msgstr ""
 "Vyžaduje \"úplnou\" verzi wpad/hostapd a podporu od ovladače WiFi<br/>(k "
 "lednu 2019: ath9k, ath10k, mwlwifi a mt76)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4546,11 +4555,11 @@ msgstr "Resetovat čítače"
 msgid "Reset to defaults"
 msgstr "Obnovit na výchozí"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Soubory Resolv a Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Soubor resolve"
 
@@ -4602,7 +4611,7 @@ msgstr "Požadavek na vrácení se nezdařil se stavem <code>%h</code>"
 msgid "Reverting configuration…"
 msgstr "Vracení konfigurace…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Kořenový adresář souborů, přístupných přes TFTP"
 
@@ -4628,12 +4637,13 @@ msgstr "Služba oznamování směrovače (RA)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Heslo routeru"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Trasy"
 
@@ -4670,6 +4680,7 @@ msgstr "Odstup signálu od šumu"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Přístup přes SSH"
 
@@ -4687,6 +4698,7 @@ msgstr "SSH uživatelské jméno"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH klíče"
 
@@ -4731,6 +4743,7 @@ msgstr "Skenovat"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Naplánované úlohy"
 
@@ -4775,7 +4788,7 @@ msgstr ""
 "Odesílat LCP echo požadavky každých x sekund, účinné pouze ve spojení s "
 "prahovou hodnotou selhání"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Nastavení serveru"
 
@@ -4788,7 +4801,7 @@ msgstr "Název služby"
 msgid "Service Type"
 msgstr "Typ služby"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Služby"
 
@@ -4881,7 +4894,7 @@ msgstr "Signál:"
 msgid "Size"
 msgstr "Velikost"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr "Velikost mezipaměti DNS dotazů"
 
@@ -4894,11 +4907,11 @@ msgstr "Velikost zařízení ZRam v megabajtech"
 msgid "Skip"
 msgstr "Přeskočit"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Skočit na obsah"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Skočit na navigaci"
 
@@ -5011,6 +5024,7 @@ msgstr "Zahájeno bezdrátové skenování..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Po spuštění"
 
@@ -5022,11 +5036,11 @@ msgstr "Statické IPv4 trasy"
 msgid "Static IPv6 Routes"
 msgstr "Statické IPv6 trasy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Statické zápůjčky"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Statické trasy"
 
@@ -5036,7 +5050,7 @@ msgstr "Statické trasy"
 msgid "Static address"
 msgstr "Statická adresa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -5050,10 +5064,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr "Limit nečinnosti stanice"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Stav"
 
@@ -5063,7 +5077,7 @@ msgstr "Stav"
 msgid "Stop"
 msgstr "Zastavit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Striktní výběr"
 
@@ -5076,11 +5090,11 @@ msgstr "Silné"
 msgid "Submit"
 msgstr "Odeslat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr "Potlačit logování"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Potlačit protokolování rutinního provozu těchto protokolů"
 
@@ -5089,7 +5103,7 @@ msgid "Swap free"
 msgstr "Volná paměť Swap"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Switch"
 
@@ -5140,15 +5154,16 @@ msgstr "Synchronizovat s NTP serverem"
 msgid "Sync with browser"
 msgstr "Synchronizovat s prohlížečem"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Systém"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Systémový log"
 
@@ -5164,11 +5179,11 @@ msgstr "Velikost bufferu systémového logu"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Nastavení TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "Kořenový adresář TFTP serveru"
 
@@ -5278,8 +5293,8 @@ msgid ""
 "\"Proceed\" below to start the flash procedure."
 msgstr ""
 "Obraz s firmware byl nahrán. Níže je uveden kontrolní součet a velikost "
-"souboru. Porovnejte je s originálním souborem pro zajištění integrity dat. <"
-"br /> Klepněte na \"Pokračovat\" níže pro zahájení procedury flashování."
+"souboru. Porovnejte je s originálním souborem pro zajištění integrity dat. "
+"<br /> Klepněte na \"Pokračovat\" níže pro zahájení procedury flashování."
 
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:38
 msgid "The following rules are currently active on this system."
@@ -5425,7 +5440,8 @@ msgstr ""
 "Nahraný soubor s firmware neobsahuje podporovaný formát. Ujistěte se, že "
 "jste vybrali správný formát pro svou platformu."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5435,9 +5451,9 @@ msgstr "Žádné aktivní zápůjčky"
 msgid "There are no changes to apply"
 msgstr "Žádné změny k provedení"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5458,16 +5474,16 @@ msgstr "Tento typ autentizace nelze použít s vybranou EAP metodou."
 msgid "This does not look like a valid PEM file"
 msgstr "Toto nevypadá jako platný PEM soubor"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 #, fuzzy
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
 "Name System\">DNS</abbr> servers."
 msgstr ""
-"Tento soubor může obsahovat řádky jako  'server=/domain/1.2.3.4' or 'server="
-"1.2.3.4' pro konkrétní doménové nebo plně nadřazené <abbr title=\"Domain "
-"Name System\">DNS</abbr> servery."
+"Tento soubor může obsahovat řádky jako  'server=/domain/1.2.3.4' or "
+"'server=1.2.3.4' pro konkrétní doménové nebo plně nadřazené <abbr title="
+"\"Domain Name System\">DNS</abbr> servery."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:16
@@ -5505,7 +5521,7 @@ msgstr ""
 "Toto je adresa lokálního koncového bodu přiřazená zprostředkovatelem "
 "tunelového propojení, obvykle končí na <code>...:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5534,7 +5550,8 @@ msgstr ""
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
 msgid ""
 "This is usually the address of the nearest PoP operated by the tunnel broker"
-msgstr "Toto je obvykle adresa nejbližšího PoP provozovaného tunelovým brokerem"
+msgstr ""
+"Toto je obvykle adresa nejbližšího PoP provozovaného tunelovým brokerem"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:64
 msgid ""
@@ -5585,14 +5602,15 @@ msgstr "Tón"
 msgid "Total Available"
 msgstr "Dostupná celkem"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Traceroute"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Provoz"
 
@@ -5825,7 +5843,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Doba běhu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Použít <code>/etc/ethers</code>"
 
@@ -5936,7 +5954,7 @@ msgstr "Použít metriku brány"
 msgid "Use routing table"
 msgstr "Použít směrovací tabulku"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5993,7 +6011,7 @@ msgstr "VDSL"
 msgid "VLANs on %q"
 msgstr "VLANy na %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr "VPN"
 
@@ -6073,10 +6091,6 @@ msgstr ""
 "Šifrování WPA vyžaduje nainstalovaný wpa_supplicant (pro klientský režim) "
 "nebo hostapd (pro AP a ad-hoc režim)."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "Čekání na dokončení příkazu..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "Čekání na zařízení…"
@@ -6114,9 +6128,9 @@ msgstr "Šířka"
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Bezdrátová síť"
 
@@ -6164,7 +6178,7 @@ msgstr "Bezdrátová síť je zakázána"
 msgid "Wireless network is enabled"
 msgstr "Bezdrátová síť je povolena"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Zapisovat přijaté požadavky DNS do systemového logu"
 
@@ -6195,9 +6209,9 @@ msgstr ""
 "zařízení.<br /><strong>Varování: Pokud zakážete základní init skripty jako "
 "\"network\", vaše zařízení se může stát nepřístupným!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6220,7 +6234,7 @@ msgstr "Nastavení ZRam"
 msgid "ZRam Size"
 msgstr "Velikost ZRam"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "libovolný"
 
@@ -6309,13 +6323,14 @@ msgstr "zakázáno"
 msgid "driver default"
 msgstr "výchozí nastavení ovladače"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "expirovaná"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6369,7 +6384,7 @@ msgstr "délka klíče v rozmezí 8 až 63 znaků"
 msgid "key with either 5 or 13 characters"
 msgstr "délka klíče 8, nebo 13 znaků"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "místní <abbr title=\"Domain Name System\">DNS</abbr> soubor"
 
@@ -6406,16 +6421,16 @@ msgstr "není k dispozici"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "vypnuto"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "zapnuto"
@@ -6493,8 +6508,9 @@ msgstr "jedinečná hodnota"
 msgid "unknown"
 msgstr "neznámý"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6522,6 +6538,7 @@ msgid "untagged"
 msgstr "neoznačený"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr "platná IP adresa"
 
@@ -6534,6 +6551,7 @@ msgid "valid IPv4 CIDR"
 msgstr "platný IPv4 CIDR"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr "platná IPv4 adresa"
 
@@ -6562,6 +6580,7 @@ msgid "valid IPv6 CIDR"
 msgstr "platný IPv6 CIDR"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr "platná IPv6 adresa"
 
@@ -6621,6 +6640,9 @@ msgstr "platný hostitel:port"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr "platný název hostitele"
 
@@ -6646,6 +6668,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr "platný port nebo rozsah portů (port1-port2)"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr "platná hodnota portu"
 
@@ -6693,6 +6716,18 @@ msgstr "ano"
 msgid "« Back"
 msgstr "« Zpět"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Zadána neplatná adresa!"
+
+#~ msgid "Install iputils-traceroute6 for IPv6 traceroute"
+#~ msgstr "Nainstalujte balíček iputils-traceroute6 pro IPv6 traceroute"
+
+#~ msgid "Loading"
+#~ msgstr "Načítání"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "Čekání na dokončení příkazu..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Přiřadit rozhraní..."
 
diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index 755a52e7f..e82ce1583 100644
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -43,6 +43,8 @@ msgstr "(%d Minuten Abschnitt, %d Sekunden Intervall)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -150,15 +152,15 @@ msgstr "802.11w: Wiederholungsintervall"
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> Abfrageport"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> Serverport"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -170,7 +172,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Addresse"
@@ -197,13 +199,14 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hexadezimal)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Konfiguration"
 
@@ -211,18 +214,18 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Konfiguration"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Adresse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 "<abbr title=\"Eindeutiger DHCP Bezeichner (DHCP Unique Identifier)\">DUID</"
 "abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -230,7 +233,7 @@ msgstr ""
 "<abbr title=\"maximal\">Max.</abbr> Anzahl von <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Leases"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -238,7 +241,7 @@ msgstr ""
 "<abbr title=\"maximal\">Max.</abbr> Größe von <abbr title=\"Extension "
 "Mechanisms for Domain Name System\">EDNS0</abbr>-Paketen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Max.</abbr> Anzahl gleichzeitiger Abfragen"
 
@@ -360,6 +363,7 @@ msgstr "Aktive Verbindungen"
 msgid "Active DHCP Leases"
 msgstr "Aktive DHCP-Leases"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Aktive DHCPv6-Leases"
@@ -415,7 +419,7 @@ msgstr "Instanz hinzufügen"
 msgid "Add key"
 msgstr "Schlüssel hinzufügen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Lokalen Domainsuffx an Namen aus der Hosts-Datei anhängen"
 
@@ -428,11 +432,11 @@ msgstr "Neue Schnittstelle hinzufügen..."
 msgid "Add peer"
 msgstr "Peer hinzufügen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Zusätzliche Hosts-Dateien"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "Zusätzliche Nameserver-Datei"
 
@@ -453,12 +457,13 @@ msgstr "Adresse"
 msgid "Address to access local relay bridge"
 msgstr "Adresse der lokalen Relay-Brücke"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administration"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -487,11 +492,11 @@ msgstr "Alias-Schnittstelle"
 msgid "Alias of \"%s\""
 msgstr "Alias von \"%s\""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr "Alle Server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
@@ -499,7 +504,7 @@ msgstr ""
 "IP-Adressen sequenziell vergeben, beginnend mit der kleinsten verfügbaren "
 "Adresse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr "IPs sequenziell vergeben"
 
@@ -526,7 +531,7 @@ msgstr "Veraltete 802.11b-Raten erlauben"
 msgid "Allow listed only"
 msgstr "Nur gelistete erlauben"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Erlaube localhost"
 
@@ -544,7 +549,7 @@ msgstr ""
 "Erlaubt es dem <em>root</em> Benutzer sich mit einem Passwort statt einem "
 "Zertifikat einzuloggen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -729,7 +734,7 @@ msgstr "Authentifizierung"
 msgid "Authentication Type"
 msgstr "Authentifizierungstyp"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Authoritativ"
 
@@ -737,11 +742,11 @@ msgstr "Authoritativ"
 msgid "Authorization Required"
 msgstr "Autorisierung benötigt"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -835,6 +840,7 @@ msgid "Backup"
 msgstr "Sichern"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Backup / Firmware Update"
 
@@ -843,10 +849,6 @@ msgstr "Backup / Firmware Update"
 msgid "Backup file list"
 msgstr "Liste zu sichernder Dateien"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Ungültige Adresse angegeben!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -868,7 +870,7 @@ msgstr ""
 "markierten Konfigurationsdateien. Des Weiteren sind die durch "
 "benutzerdefinierte Dateiemuster betroffenen Dateien enthalten."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -890,7 +892,7 @@ msgstr "Tunnelendpunkt an diese Schnittstelle binden (optional)."
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Ungültige \"NX-Domain\" Antworten ignorieren"
 
@@ -1092,10 +1094,11 @@ msgid "Close list..."
 msgstr "Schließe Liste..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Sammle Daten..."
 
@@ -1128,7 +1131,6 @@ msgstr ""
 "Schlüsselerneuerungen in ausgelasteten Umgebungen verringern."
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Konfiguration"
@@ -1168,7 +1170,7 @@ msgstr "Verbindungsversuch fehlgeschlagen"
 msgid "Connection lost"
 msgstr "Verbindung verloren"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Verbindungen"
 
@@ -1251,8 +1253,8 @@ msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
 msgstr ""
-"Passt das Verhalten der Geräte-<abbr title=\"Light Emitting Diode\""
-">LED</abbr>s an - wenn dies möglich ist."
+"Passt das Verhalten der Geräte-<abbr title=\"Light Emitting Diode\">LED</"
+"abbr>s an - wenn dies möglich ist."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1258
 msgid "DAE-Client"
@@ -1270,8 +1272,8 @@ msgstr "DAE-Geheimnis"
 msgid "DHCP Server"
 msgstr "DHCP-Server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP und DNS"
 
@@ -1306,7 +1308,7 @@ msgstr "DHCPv6-Dienst"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "DNS-Weiterleitungen"
 
@@ -1314,11 +1316,11 @@ msgstr "DNS-Weiterleitungen"
 msgid "DNS-Label / FQDN"
 msgstr "DNS-Label / FQDN"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr "DNSSEC Signaturstatus prüfen"
 
@@ -1347,6 +1349,7 @@ msgstr "DSL Leitungsmodus"
 msgid "DTIM Interval"
 msgstr "DTIM-Intervall"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1487,8 +1490,7 @@ msgstr "Das Gerät ist nicht erreichbar!"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "Gerät nicht erreichbar! Wartet immer noch..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Diagnosen"
 
@@ -1547,7 +1549,7 @@ msgstr "Deaktiviert"
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Trennung bei schlechtem Antwortverhalten"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Eingehende RFC1918-Antworten verwerfen"
 
@@ -1582,7 +1584,7 @@ msgid "Distance to farthest network member in meters."
 msgstr "Distanz zum am weitesten entfernten Funkpartner in Metern."
 
 # Nur für NAT-Firewalls?
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1594,19 +1596,19 @@ msgstr ""
 "abbr>-Forwarder für <abbr title=\"Network Address Translation\">NAT</abbr> "
 "Router"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 "Negative Antworten nicht zwischenspeichern, z.B. bei nicht existierenden "
 "Domains"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Keine Anfragen weiterleiten welche nicht durch öffentliche Server "
 "beantwortet werden können"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Keine Rückwärtsauflösungen für lokale Netzwerke weiterleiten"
 
@@ -1627,11 +1629,11 @@ msgstr "Möchten Sie wirklich alle Einstellungen löschen?"
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr "Soll das Verzeichnis \"%s\" wirklich rekursiv gelöscht werden?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Anfragen nur mit Domain"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Domain-Whitelist"
 
@@ -1639,13 +1641,13 @@ msgstr "Domain-Whitelist"
 msgid "Don't Fragment"
 msgstr "Nicht fragmentieren"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 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>-Anfragen ohne <abbr title=\""
-"Domain Name System\">DNS</abbr>-Name nicht weiterleiten"
+"<abbr title=\"Domain Name System\">DNS</abbr>-Anfragen ohne <abbr title="
+"\"Domain Name System\">DNS</abbr>-Name nicht weiterleiten"
 
 #: modules/luci-compat/luasrc/view/cbi/tblsection.htm:152
 msgid "Down"
@@ -1677,8 +1679,8 @@ msgid ""
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Der <abbr title=\"Secure Shell\">SSH</abbr>-Server ermöglicht Shell-Zugriff "
-"über das Netzwerk und bietet einen integrierten <abbr title=\"Secure Copy\""
-">SCP</abbr>-Dienst"
+"über das Netzwerk und bietet einen integrierten <abbr title=\"Secure Copy"
+"\">SCP</abbr>-Dienst"
 
 #: modules/luci-compat/luasrc/model/network/proto_4x6.lua:14
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
@@ -1792,7 +1794,7 @@ msgstr "Aktiviere NTP-Client"
 msgid "Enable Single DES"
 msgstr "Single-DES aktivieren"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "TFTP-Server aktivieren"
 
@@ -1914,11 +1916,11 @@ msgstr "Netzwerkschnittstelle"
 msgid "Ethernet Switch"
 msgstr "Netzwerk Switch"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr "Schnittstellen ausschließen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Hosts vervollständigen"
 
@@ -1927,6 +1929,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr "Erwarte einen hexadezimalen Zuordnungshinweis"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr "Erwarte: %s"
 
@@ -2007,7 +2016,7 @@ msgstr "Datei nicht verfügbar"
 msgid "Filename"
 msgstr "Dateiname"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "Dateiname des Boot-Images welches den Clients mitgeteilt wird"
 
@@ -2016,11 +2025,11 @@ msgstr "Dateiname des Boot-Images welches den Clients mitgeteilt wird"
 msgid "Filesystem"
 msgstr "Dateisystem"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Private Anfragen filtern"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Windowsanfragen filtern"
 
@@ -2045,7 +2054,7 @@ msgstr "Suchen und Verbinden von Netzwerken"
 msgid "Finish"
 msgstr "Fertigstellen"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -2069,7 +2078,7 @@ msgstr "Firmware-Datei"
 msgid "Firmware Version"
 msgstr "Firmware Version"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Fester Port für ausgehende DNS-Anfragen"
 
@@ -2201,7 +2210,7 @@ msgstr "Gateway-Adresse ist ungültig"
 msgid "Gateway metric"
 msgstr "Gateway-Metrik"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2242,9 +2251,9 @@ msgstr "Globale Einstellungen"
 msgid "Global network options"
 msgstr "Globale Netzwerkeinstellungen"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Zur Passwortkonfiguration..."
@@ -2290,13 +2299,15 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
-msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr> verstecken"
+msgstr ""
+"<abbr title=\"Extended Service Set Identifier\">ESSID</abbr> verstecken"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:99
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:61
 msgid "Hide empty chains"
 msgstr "Leere Chains ausblenden"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2320,7 +2331,7 @@ msgid "Host-Uniq tag content"
 msgstr "\"Host-Uniq\"-Bezeichner"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2333,7 +2344,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "Zu sendender Hostname bei DHCP Anfragen"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Rechnernamen"
 
@@ -2371,13 +2382,13 @@ msgstr "IP-Adresse ist ungültig"
 msgid "IP address is missing"
 msgstr "IP-Adresse fehlt"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2445,6 +2456,8 @@ msgstr "IPv4-in-IPv4 (RFC2003)"
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr "IPv4/IPv6 (beide - standardmäßig IPv4)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2455,8 +2468,6 @@ msgstr "IPv4/IPv6 (beide - standardmäßig IPv4)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2526,6 +2537,7 @@ msgstr "Geroutetes IPv6-Präfix"
 msgid "IPv6 suffix"
 msgstr "IPv6 Endung"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2625,7 +2637,7 @@ msgstr ""
 "effektive Größe des Arbeitsspeichers zu erhöhen. Die Auslagerung der Daten "
 "ist natürlich bedeutend langsamer als direkte Arbeitsspeicherzugriffe."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignoriere <code>/etc/hosts</code>"
 
@@ -2633,7 +2645,7 @@ msgstr "Ignoriere <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Schnittstelle ignorieren"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Resolv-Datei ignorieren"
 
@@ -2688,12 +2700,6 @@ msgstr "Startscript"
 msgid "Initscripts"
 msgstr "Startscripte"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-"Bitte \"iputils-traceroute6\" installieren um IPv6-Routenverfolgung nutzen "
-"zu können"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Installiere Protokoll-Erweiterungen..."
@@ -2756,7 +2762,7 @@ msgstr "Schnittstelle existiert nicht oder ist nicht verbunden."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Schnittstellen"
 
@@ -2814,9 +2820,9 @@ msgstr ""
 "Das verwendete Image scheint zu groß für den internen Flash-Speicher zu "
 "sein. Überprüfen Sie die Imagedatei!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "JavaScript benötigt!"
@@ -2837,8 +2843,8 @@ msgstr "Trete Netzwerk %q bei"
 msgid "Keep settings and retain the current configuration"
 msgstr "Einstellungen beibehalten und die aktuelle Konfiguration sichern"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Kernelprotokoll"
 
@@ -2914,16 +2920,17 @@ msgstr "Latenz"
 msgid "Leaf"
 msgstr "Zweigstelle"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "Laufzeit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Leasedatei"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2950,13 +2957,13 @@ msgstr "Legende:"
 msgid "Limit"
 msgstr "Limit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 "DNS-Dienste auf direkte lokale Subnetze beschränken um Missbrauch durch "
 "Dritte zu verhindern."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "Dienste auf die angegeben Schnittstellen plus Loopback beschränken."
 
@@ -2980,7 +2987,7 @@ msgstr "Verbindungsdauer"
 msgid "Link On"
 msgstr "Verbindung hergestellt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -3022,15 +3029,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr "Liste der SSH Schlüssel zur Authentifikation"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Liste von Domains für welche RFC1918-Antworten erlaubt sind"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "Liste von Servern die falsche \"NX Domain\" Antworten liefern"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr "Aktive Schnittstellen"
 
@@ -3044,12 +3051,12 @@ msgstr ""
 "Nur auf die gegebene Schnittstelle reagieren, nutze alle wenn nicht "
 "spezifiziert"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Serverport für eingehende DNS Abfragen"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Last"
 
@@ -3057,10 +3064,6 @@ msgstr "Last"
 msgid "Load Average"
 msgstr "Durchschnittslast"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Lade"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr "Lade Verzeichniseinträge…"
@@ -3093,7 +3096,7 @@ msgstr "Lokale IPv4 Adresse"
 msgid "Local IPv6 address"
 msgstr "Lokale IPv6 Adresse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr "Nur lokale Dienste"
 
@@ -3106,11 +3109,11 @@ msgstr "Lokales Startskript"
 msgid "Local Time"
 msgstr "Lokale Zeit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Lokale Domain"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3119,17 +3122,17 @@ msgstr ""
 "diese Domain zutreffen werden nie weitergeleitet und ausschließlich aus DHCP-"
 "Namen oder Hosts-Dateien aufgelöst"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 "Lokaler Domain-Suffix welcher an DHCP Namen und Host-Datei Einträge "
 "angehangen wird"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Lokaler Server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3137,7 +3140,7 @@ msgstr ""
 "Hostnamen je nach anfragendem Subnetz auflösen wenn mehrere IPs verfügbar "
 "sind"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Lokalisiere Anfragen"
 
@@ -3145,7 +3148,7 @@ msgstr "Lokalisiere Anfragen"
 msgid "Log output level"
 msgstr "Protokolllevel"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Schreibe Abfragelog"
 
@@ -3157,7 +3160,7 @@ msgstr "Protokollierung"
 msgid "Login"
 msgstr "Anmelden"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -3254,15 +3257,15 @@ msgstr "Maximal erreichbare Datenrate (ATTNDR)"
 msgid "Maximum allowed Listen Interval"
 msgstr "Maximal erlaubter Inaktivitätszeitraum"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Maximal zulässige Anzahl von aktiven DHCP-Leases"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Maximal zulässige Anzahl an gleichzeitigen DNS-Anfragen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Maximal zulässige Größe von EDNS.0 UDP Paketen"
 
@@ -3402,6 +3405,7 @@ msgstr "Einhängepunkt"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Einhängepunkte"
 
@@ -3495,11 +3499,10 @@ msgstr "Name"
 msgid "Name of the new network"
 msgstr "Name des neuen Netzwerkes"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navigation"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3507,14 +3510,15 @@ msgstr "Navigation"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Netzwerk"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Netzwerk-Werkzeuge"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Netzwerk-Boot-Image"
 
@@ -3572,13 +3576,13 @@ msgstr "Keine Informationen verfügbar"
 msgid "No matching prefix delegation"
 msgstr "Kein passendes delegiertes Prefix"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Kein Negativ-Cache"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Kein Passwort gesetzt!"
@@ -3624,7 +3628,7 @@ msgstr "Rauschen:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "Nicht-präemptive CRC-Fehler (CRC_P)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr "An Schnittstellen binden"
 
@@ -3666,11 +3670,11 @@ msgstr "Nicht unterstützt"
 msgid "Notice"
 msgstr "Notiz"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "DNS-Auflösung"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 "Anzahl der zwischengespeicherten DNS-Einträge. Maximum sind 10000 Einträge, "
@@ -3719,7 +3723,7 @@ msgstr "Link-lokale Route"
 msgid "On-State Delay"
 msgstr "Verzögerung für Anschalt-Zustand"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "Es muss entweder ein Hostname oder eine MAC-Adresse angegeben werden!"
 
@@ -3910,7 +3914,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr "Überschreibt die benutzte Tabelle für interne Routen"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Übersicht"
 
@@ -4138,8 +4142,9 @@ msgstr "Phy-Rate:"
 msgid "Physical Settings"
 msgstr "Physische Einstellungen"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ping"
 
@@ -4217,7 +4222,7 @@ msgstr ""
 "Deklariere den Client als tot nach der angegebenen Anzahl von LCP Echo "
 "Fehlschlägen, nutze den Wert 0 um Fehler zu ignorieren"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr "Verhindert das Binden an diese Schnittstellen."
 
@@ -4230,7 +4235,7 @@ msgid "Private Key"
 msgstr "Privater Schlüssel"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Prozesse"
 
@@ -4295,13 +4300,13 @@ msgstr "QMI Cellular"
 msgid "Quality"
 msgstr "Qualität"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
-"Alle verfügbaren übergeordneten <abbr title=\"Domain Name System\""
-">DNS</abbr>-Server abfragen"
+"Alle verfügbaren übergeordneten <abbr title=\"Domain Name System\">DNS</"
+"abbr>-Server abfragen"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1395
 msgid "R0 Key Lifetime"
@@ -4367,7 +4372,7 @@ msgstr ""
 "Hexadezimal-kodierte Zeichensequenz. Nur angeben wenn der Internetanbieter "
 "einen bestimmten Wert erwartet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4379,7 +4384,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "Protokoll wirklich wechseln?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Echtzeit-Diagramme"
 
@@ -4387,12 +4392,13 @@ msgstr "Echtzeit-Diagramme"
 msgid "Reassociation Deadline"
 msgstr "Reassoziierungsfrist"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "DNS-Rebind-Schutz"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Neu Starten"
 
@@ -4527,7 +4533,7 @@ msgstr ""
 "Benötigt die \"full\" Variante von wpad/hostapd und Unterstützung vom WLAN-"
 "Treiber<br />(Stand: Januar 2019: ath9k, ath10k, mwlwifi, mt76)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4575,11 +4581,11 @@ msgstr "Zähler zurücksetzen"
 msgid "Reset to defaults"
 msgstr "Auslieferungszustand wiederherstellen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Resolv- und Hosts-Dateien"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Resolv-Datei"
 
@@ -4631,7 +4637,7 @@ msgstr "Anforderung zum Verwerfen mit Status <code>%h</code> fehlgeschlagen"
 msgid "Reverting configuration…"
 msgstr "Verwerfe Konfigurationsänderungen…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Wurzelverzeichnis für über TFTP ausgelieferte Dateien"
 
@@ -4657,12 +4663,13 @@ msgstr "Router-Advertisement-Dienst"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Routerpasswort"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Routen"
 
@@ -4700,6 +4707,7 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH-Zugriff"
 
@@ -4717,6 +4725,7 @@ msgstr "SSH Benutzername"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH-Schlüssel"
 
@@ -4761,6 +4770,7 @@ msgstr "Suche"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Geplante Aufgaben"
 
@@ -4805,7 +4815,7 @@ msgstr ""
 "Sende LCP Echo Anforderungen im angegebenem Interval in Sekunden, nur "
 "effektiv in Verbindung mit einem Fehler-Schwellwert"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Servereinstellungen"
 
@@ -4818,7 +4828,7 @@ msgstr "Service-Name"
 msgid "Service Type"
 msgstr "Service-Typ"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Dienste"
 
@@ -4912,7 +4922,7 @@ msgstr "Signal:"
 msgid "Size"
 msgstr "Größe"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr "Größe des DNS-Caches"
 
@@ -4925,11 +4935,11 @@ msgstr "Größe der ZRAM-Gerätedatei in Megabytes"
 msgid "Skip"
 msgstr "Überspringen"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Zum Inhalt springen"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Zur Navigation springen"
 
@@ -5045,6 +5055,7 @@ msgstr "Starte WLAN Scan..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Systemstart"
 
@@ -5056,11 +5067,11 @@ msgstr "Statische IPv4 Routen"
 msgid "Static IPv6 Routes"
 msgstr "Statische IPv6 Routen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Statische Einträge"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Statische Routen"
 
@@ -5070,7 +5081,7 @@ msgstr "Statische Routen"
 msgid "Static address"
 msgstr "Statische Adresse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -5085,10 +5096,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr "Client-Inaktivitäts-Limit"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Status"
 
@@ -5098,7 +5109,7 @@ msgstr "Status"
 msgid "Stop"
 msgstr "Stoppen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Strikte Reihenfolge"
 
@@ -5111,11 +5122,11 @@ msgstr "Stark"
 msgid "Submit"
 msgstr "Absenden"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr "Logeinträge unterdrücken"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 "Logeinträge für erfolgreiche Operationen dieser Protokolle unterdrücken"
@@ -5125,7 +5136,7 @@ msgid "Swap free"
 msgstr "Swap frei"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Switch"
 
@@ -5175,15 +5186,16 @@ msgstr "Mit NTP-Server synchronisieren"
 msgid "Sync with browser"
 msgstr "Mit Browser synchronisieren"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "System"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Systemprotokoll"
 
@@ -5199,11 +5211,11 @@ msgstr "Größe des Systemprotokoll-Puffers"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "TFTP Einstellungen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "TFTP Wurzelverzeichnis"
 
@@ -5303,8 +5315,8 @@ 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 (<abbr title=\"zum "
-"Beispiel\">z.B.</abbr>: <code>/dev/sda1</code>)"
+"Die Gerätedatei des Speichers oder der Partition (<abbr title=\"zum Beispiel"
+"\">z.B.</abbr>: <code>/dev/sda1</code>)"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:646
 msgid ""
@@ -5384,8 +5396,8 @@ msgid ""
 "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 Netzwerkanschlüsse dieses Geräts können zu mehreren <abbr title=\""
-"Virtual Local Area Network\">VLAN</abbr>s kombiniert werden, in denen "
+"Die Netzwerkanschlüsse dieses Geräts können zu mehreren <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s kombiniert werden, in denen "
 "Computer direkt miteinander kommunizieren können. <abbr title=\"Virtual "
 "Local Area Network\">VLAN</abbr>s werden häufig zur Trennung verschiedener "
 "Netzwerksegmente verwendet. Oftmals gibt es standardmäßig einen Uplink-Port "
@@ -5478,7 +5490,8 @@ 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."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5488,9 +5501,9 @@ msgstr "Es gibt keine aktiven Leases"
 msgid "There are no changes to apply"
 msgstr "Es gibt keine anzuwendenden Änderungen"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5513,7 +5526,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr "Dies scheint keine gültige PEM-Datei zu sein"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5560,13 +5573,13 @@ msgstr ""
 "Dies ist die lokale, vom Broker zugewiesene IPv6-Adresse, sie endet "
 "üblicherweise mit <code>...:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
 msgstr ""
-"Dies ist der einzige <abbr title=\"Dynamic Host Configuration Protocol\""
-">DHCP</abbr>-Server im lokalen Netzwerk"
+"Dies ist der einzige <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server im lokalen Netzwerk"
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
@@ -5641,15 +5654,16 @@ msgstr "Ton"
 msgid "Total Available"
 msgstr "Gesamt verfügbar"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Routenverfolgung"
 
 # Ich bin der Meinung Traffic versteht jeder! Wenn der Begriff "deutscher" sein soll, würde ich "Datenmenge" angeben. Aber "Verkehrs" passt nicht!
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Traffic"
 
@@ -5882,7 +5896,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Laufzeit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Verwende <code>/etc/ethers</code>"
 
@@ -5993,7 +6007,7 @@ msgstr "Benutze Gateway-Metrik"
 msgid "Use routing table"
 msgstr "Benutze Routing-Tabelle"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -6050,7 +6064,7 @@ msgstr "VDSL"
 msgid "VLANs on %q"
 msgstr "VLANs auf %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr "VPN"
 
@@ -6130,10 +6144,6 @@ msgstr ""
 "WPA-Verschlüsselung benötigt wpa_supplicant (für Client-Modus) oder hostapd "
 "(für AP oder Ad-Hoc Modus)."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "Der Befehl wird ausgeführt..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "Warte auf Gerät..."
@@ -6173,9 +6183,9 @@ msgstr "Breite"
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "WLAN"
 
@@ -6223,7 +6233,7 @@ msgstr "Das WLAN-Netzwerk ist deaktiviert"
 msgid "Wireless network is enabled"
 msgstr "Das WLAN-Netzwerk ist aktiviert"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Empfangene DNS-Anfragen in das Systemprotokoll schreiben"
 
@@ -6255,9 +6265,9 @@ msgstr ""
 "><strong>Warnung: Wenn essentielle Startscripte wie \"network\" deaktiviert "
 "werden könnte das Gerät unerreichbar werden!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6281,7 +6291,7 @@ msgstr "ZRAM Einstellungen"
 msgid "ZRam Size"
 msgstr "ZRAM Größe"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "beliebig"
 
@@ -6370,19 +6380,20 @@ msgstr "deaktiviert"
 msgid "driver default"
 msgstr "Treiber-Standardwert"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "abgelaufen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
 msgstr ""
-"Speicherort für vergebene <abbr title=\"Dynamic Host Configuration Protocol\""
-">DHCP</abbr>-Adressen"
+"Speicherort für vergebene <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Adressen"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:85
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:194
@@ -6430,7 +6441,7 @@ msgstr "Schlüssel zwischen 8 und 63 Zeichen"
 msgid "key with either 5 or 13 characters"
 msgstr "Schlüssel mit exakt 5 oder 13 Zeichen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Lokale <abbr title=\"Domain Name System\">DNS</abbr>-Datei"
 
@@ -6467,16 +6478,16 @@ msgstr "nicht vorhanden"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "aus"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "ein"
@@ -6554,8 +6565,9 @@ msgstr "eindeutigen Wert"
 msgid "unknown"
 msgstr "unbekannt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6583,6 +6595,7 @@ msgid "untagged"
 msgstr "unmarkiert"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr "gültige IP-Adresse"
 
@@ -6595,6 +6608,7 @@ msgid "valid IPv4 CIDR"
 msgstr "gültige IPv4-CIDR-Notation"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr "gültige IPv4-Adresse"
 
@@ -6623,6 +6637,7 @@ msgid "valid IPv6 CIDR"
 msgstr "gültige iPv6-CIDR-Notation"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr "gültige IPv6-Adresse"
 
@@ -6682,6 +6697,9 @@ msgstr "gültige \"Host:Port\" Notation"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr "gültigen Hostnamen"
 
@@ -6707,6 +6725,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr "gültigen Netzwerkport oder Port-Bereich (von-bis)"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr "gültigen Netzwerkport"
 
@@ -6754,6 +6773,20 @@ msgstr "ja"
 msgid "« Back"
 msgstr "« Zurück"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Ungültige Adresse angegeben!"
+
+#~ msgid "Install iputils-traceroute6 for IPv6 traceroute"
+#~ msgstr ""
+#~ "Bitte \"iputils-traceroute6\" installieren um IPv6-Routenverfolgung "
+#~ "nutzen zu können"
+
+#~ msgid "Loading"
+#~ msgstr "Lade"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "Der Befehl wird ausgeführt..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Schnittstellen zuweisen..."
 
diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po
index 1f266cdfb..f18d8f872 100644
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -42,6 +42,8 @@ msgstr "(παράθυρο %d λεπτών, διάστημα %d δευτερολ�
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -148,15 +150,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "Θύρα ερωτημάτων <abbr title=\"Σύστημα Ονόματος Τομέα\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "Θύρα εξυπηρετητή <abbr title=\"Σύστημα Ονόματος Τομέα\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -168,7 +170,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Διεύθυνση <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -195,12 +197,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Πύλη <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Παραμετροποίηση <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
@@ -208,16 +211,16 @@ msgstr "Παραμετροποίηση <abbr title=\"Light Emitting Diode\">LED<
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Όνομα <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Διεύθυνση <abbr title=\"Media Access Control\">MAC</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -225,7 +228,7 @@ msgstr ""
 "<abbr title=\"μέγιστο\">Μεγ.</abbr> πλήθος <abbr title=\"Πρωτόκολλο "
 "Παραμετροποίησης Δυναμικού Συστήματος\">DHCP</abbr> leases"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -233,7 +236,7 @@ msgstr ""
 "<abbr title=\"μέγιστο\">Μεγ.</abbr> μέγεθος πακέτου <abbr title=\"Μηχανισμοί "
 "επεκτάσεων για Συστήματα Ονόματος Τομέα\">EDNS0</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"μέγιστο\">Μεγ.</abbr> πλήθος ταυτόχρονων ερωτηματων"
 
@@ -354,6 +357,7 @@ msgstr "Ενεργές Συνδέσεις"
 msgid "Active DHCP Leases"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr ""
@@ -409,7 +413,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "Προσθήκη κατάληξης τοπικού τομέα για ονόματα εξυπηρετούμενα από αρχεία hosts"
@@ -423,11 +427,11 @@ msgstr "Προσθήκη νέας διεπαφής..."
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Επιπλέον αρχεία Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -448,12 +452,13 @@ msgstr "Διεύθυνση"
 msgid "Address to access local relay bridge"
 msgstr "Διεύθυνση για πρόσβαση σε την τοπική γέφυρα αναμετάδοσης"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Διαχείριση"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -482,17 +487,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -518,7 +523,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr "Να επιτρέπονται μόνο αυτές στην λίστα"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Να επιτρέπεται το localhost"
 
@@ -537,7 +542,7 @@ msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 "Να επιτρέπεται στον χρήστη <em>root</em> να συνδέετε με κωδικό πρόσβασης"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -710,7 +715,7 @@ msgstr "Εξουσιοδότηση"
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Κύριος"
 
@@ -718,11 +723,11 @@ msgstr "Κύριος"
 msgid "Authorization Required"
 msgstr "Απαιτείται Εξουσιοδότηση"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -816,6 +821,7 @@ msgid "Backup"
 msgstr "Αντίγραφο ασφαλείας"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Αντίγραφο ασφαλείας / Εγγραφή FLASH Υλικολογισμικό"
 
@@ -824,11 +830,6 @@ msgstr "Αντίγραφο ασφαλείας / Εγγραφή FLASH Υλικο�
 msgid "Backup file list"
 msgstr "Λίστα αρχείων για αντίγραφο ασφαλείας"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-#, fuzzy
-msgid "Bad address specified!"
-msgstr "Μη έγκυρη διεύθυνση!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -850,7 +851,7 @@ msgstr ""
 "ουσιώδη βασικά αρχεία καθώς και καθορισμένα από το χρήστη μοτίβα αντιγράφων "
 "ασφαλείας."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -870,7 +871,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr "Ρυθμός δεδομένων"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Παράκαμψη Ψευδούς Τομέα NX"
 
@@ -1065,10 +1066,11 @@ msgid "Close list..."
 msgstr "Κλείσιμο λίστας..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Συλλογή δεδομένων..."
 
@@ -1097,7 +1099,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Διαμόρφωση"
@@ -1137,7 +1138,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Συνδέσεις"
 
@@ -1232,8 +1233,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr "Εξυπηρετητής DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP και DNS"
 
@@ -1268,7 +1269,7 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "Προωθήσεις DNS"
 
@@ -1276,11 +1277,11 @@ msgstr "Προωθήσεις DNS"
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1309,6 +1310,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1449,8 +1451,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Διαγνωστικά"
 
@@ -1509,7 +1510,7 @@ msgstr "Απενεργοποιημένο"
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Αγνόησε τις απαντήσεις ανοδικής ροής RFC1918"
 
@@ -1543,7 +1544,7 @@ msgstr "Βελτιστοποίηση Απόστασης"
 msgid "Distance to farthest network member in meters."
 msgstr "Απόσταση σε μέτρα από το πιο απομακρυσμένο μέλος του δικτύου."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1555,19 +1556,19 @@ msgstr ""
 "title=\"Σύστημα Ονόματος Τομέα\">DNS</abbr> για τείχη προστασίας <abbr title="
 "\"Μεταφραστή Διεύθυνσης Δικτύου\">NAT</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 "Να μην αποθηκεύονται στη λανθάνουσα μνήμη οι αρνητικές απαντήσεις, π.χ. για "
 "μη υπαρκτούς τομείς"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Να μην προωθούνται αιτήματα τα οποία δεν μπορούν να απαντηθούν από δημόσιους "
 "εξυπηρετητές ονομάτων"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1587,11 +1588,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Απαίτηση για όνομα τομέα"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Λευκή λίστα τομέων"
 
@@ -1599,7 +1600,7 @@ msgstr "Λευκή λίστα τομέων"
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1748,7 +1749,7 @@ msgstr ""
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Ενεργοποίηση εξυπηρετητή TFTP"
 
@@ -1868,11 +1869,11 @@ msgstr "Προσαρμογέας Ethernet"
 msgid "Ethernet Switch"
 msgstr "Ethernet Switch"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr ""
 
@@ -1881,6 +1882,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1960,7 +1968,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "Όνομα αρχείου της εικόνας εκκίνησης που διαφημίζετε στους πελάτες"
 
@@ -1969,11 +1977,11 @@ msgstr "Όνομα αρχείου της εικόνας εκκίνησης πο�
 msgid "Filesystem"
 msgstr "Σύστημα Αρχείων"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Φιλτράρισμα ιδιωτικών"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Φιλτράρισμα άχρηστων"
 
@@ -1996,7 +2004,7 @@ msgstr "Εύρεση και σύνδεση σε δίκτυο"
 msgid "Finish"
 msgstr "Τέλος"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Τείχος Προστασίας"
 
@@ -2020,7 +2028,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Έκδοση Υλικολογισμικού"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2150,7 +2158,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2189,9 +2197,9 @@ msgstr ""
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr ""
@@ -2244,6 +2252,7 @@ msgstr "Κρυφό <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2268,7 +2277,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2281,7 +2290,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Ονόματα Υπολογιστών"
 
@@ -2319,13 +2328,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2393,6 +2402,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2403,8 +2414,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2474,6 +2483,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2575,7 +2585,7 @@ msgstr ""
 "προσπελαστεί με τους υψηλούς ρυθμούς μεταφοράς δεδομένων που διαθέτει η "
 "<abbr title=\"Random Access Memory\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Αγνόησε <code>/etc/hosts</code>"
 
@@ -2583,7 +2593,7 @@ msgstr "Αγνόησε <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Αγνόησε διεπαφή"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Αγνόησε αρχείο resolve"
 
@@ -2635,10 +2645,6 @@ msgstr "Σενάριο εκκίνησης"
 msgid "Initscripts"
 msgstr "Σενάρια Εκκίνησης"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Εγκατάσταση επεκτάσεων πρωτοκόλλου..."
@@ -2700,7 +2706,7 @@ msgstr "Η διεπαφή δεν υπάρχει ή δεν έχει συνδεθ�
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Διεπαφές"
 
@@ -2758,9 +2764,9 @@ msgstr ""
 "Φαίνεται πως προσπαθείτε να φλασάρετε μια εικόνα που δεν χωράει στην μνήμη "
 "flash, παρακαλώ επιβεβαιώστε το αρχείο εικόνας!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "Απαιτείται JavaScript!"
@@ -2781,8 +2787,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Καταγραφή Πυρήνα"
 
@@ -2858,16 +2864,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Αρχείο Leases"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2894,11 +2901,11 @@ msgstr "Υπόμνημα:"
 msgid "Limit"
 msgstr "Όριο"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2922,7 +2929,7 @@ msgstr ""
 msgid "Link On"
 msgstr "Αναμμένο με Ζεύξη"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2950,15 +2957,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2970,12 +2977,12 @@ msgstr "Θύρα ακρόασης"
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Φόρτος"
 
@@ -2983,10 +2990,6 @@ msgstr "Φόρτος"
 msgid "Load Average"
 msgstr "Μέσος όρος φόρτου"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Φόρτωση"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -3019,7 +3022,7 @@ msgstr "Τοπική διεύθυνση IPv4"
 msgid "Local IPv6 address"
 msgstr "Τοπική διεύθυνση IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -3032,31 +3035,31 @@ msgstr ""
 msgid "Local Time"
 msgstr "Τοπική Ώρα"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Τοπικός εξυπηρετητής"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Τοπικά ερωτήματα"
 
@@ -3064,7 +3067,7 @@ msgstr "Τοπικά ερωτήματα"
 msgid "Log output level"
 msgstr "Επίπεδο εξόδου αρχείων καταγραφής"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Καταγραφή ερωτημάτων"
 
@@ -3076,7 +3079,7 @@ msgstr "Καταγραφή"
 msgid "Login"
 msgstr "Σύνδεση"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Αποσύνδεση"
 
@@ -3173,15 +3176,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Μέγιστος επιτρεπόμενος αριθμός ενεργών DHCP leases"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Μέγιστος επιτρεπόμενος αριθμός ταυτόχρονων ερωτημάτων DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Μέγιστο επιτρεπόμενο μέγεθος EDNS.0 UDP πακέτων"
 
@@ -3322,6 +3325,7 @@ msgstr "Σημείο Προσάρτησης"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Σημεία Προσάρτησης"
 
@@ -3415,11 +3419,10 @@ msgstr "Όνομα"
 msgid "Name of the new network"
 msgstr "Όνομα νέου δικτύου"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Πλοήγηση"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3427,14 +3430,15 @@ msgstr "Πλοήγηση"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Δίκτυο"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Εργαλεία Δικτύου"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr ""
 
@@ -3492,13 +3496,13 @@ msgstr "Δεν υπάρχουν πληροφορίες διαθέσιμες"
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Δεν έχει οριστεί κωδικός πρόσβασης!"
@@ -3544,7 +3548,7 @@ msgstr "Θόρυβος:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3586,11 +3590,11 @@ msgstr ""
 msgid "Notice"
 msgstr "Επισήμανση"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3637,7 +3641,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
@@ -3812,7 +3816,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Επισκόπηση"
 
@@ -4040,8 +4044,9 @@ msgstr ""
 msgid "Physical Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4117,7 +4122,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4131,7 +4136,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Εργασίες"
 
@@ -4188,7 +4193,7 @@ msgstr ""
 msgid "Quality"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4255,7 +4260,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4267,7 +4272,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "Αλλαγή πρωτοκόλλου;"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Γραφήματα πραγματικού χρόνου"
 
@@ -4275,12 +4280,13 @@ msgstr "Γραφήματα πραγματικού χρόνου"
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Επανεκκίνηση"
 
@@ -4408,7 +4414,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4454,11 +4460,11 @@ msgstr "Αρχικοποίηση Μετρητών"
 msgid "Reset to defaults"
 msgstr "Αρχικοποίηση στις προεπιλεγμένες τιμές"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Αρχεία Resolv και Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Αρχείο Resolve"
 
@@ -4510,7 +4516,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Κατάλογος Root για αρχεία που σερβίρονται μέσω TFTP"
 
@@ -4536,12 +4542,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Κωδικός Πρόσβασης Δρομολογητή"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 #, fuzzy
 msgid "Routes"
 msgstr "Διαδρομές"
@@ -4580,6 +4587,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Πρόσβαση SSH"
 
@@ -4597,6 +4605,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Κλειδιά SSH"
 
@@ -4641,6 +4650,7 @@ msgstr "Σάρωση"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Προγραμματισμένες Εργασίες"
 
@@ -4680,7 +4690,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Ρυθμίσεις Εξυπηρετητή"
 
@@ -4693,7 +4703,7 @@ msgstr "Όνομα Υπηρεσίας"
 msgid "Service Type"
 msgstr "Είδος Υπηρεσίας"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Υπηρεσίες"
 
@@ -4784,7 +4794,7 @@ msgstr "Σήμα:"
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4797,11 +4807,11 @@ msgstr ""
 msgid "Skip"
 msgstr "Παράκαμψη"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Παράκαμψη σε περιεχόμενο"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Παράκαμψη σε πλοήγηση"
 
@@ -4902,6 +4912,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Εκκίνηση"
 
@@ -4913,11 +4924,11 @@ msgstr "Στατικές Διαδρομές IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Στατικές Διαδρομές IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Στατικά Leases"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Στατικές Διαδρομές"
 
@@ -4927,7 +4938,7 @@ msgstr "Στατικές Διαδρομές"
 msgid "Static address"
 msgstr "Στατική διεύθυνση"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4938,10 +4949,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Κατάσταση"
 
@@ -4951,7 +4962,7 @@ msgstr "Κατάσταση"
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Αυστηρή σειρά"
 
@@ -4964,11 +4975,11 @@ msgstr ""
 msgid "Submit"
 msgstr "Υποβολή"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4977,7 +4988,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Switch"
 
@@ -5025,15 +5036,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Σύστημα"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Καταγραφή Συστήματος"
 
@@ -5049,11 +5061,11 @@ msgstr ""
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Ρυθμίσεις TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr ""
 
@@ -5282,7 +5294,8 @@ msgstr ""
 "Η εικόνα που ανεβάσατε δεν περιέχει κάποια υποστηριζόμενη μορφή. Βεβαιωθείτε "
 "ότι επιλέξατε την γενική μορφή εικόνας για την πλατφόρμα σας."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5292,9 +5305,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5313,7 +5326,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5346,7 +5359,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5424,14 +5437,15 @@ msgstr ""
 msgid "Total Available"
 msgstr "Διαθέσιμο Συνολικά"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Κίνηση"
 
@@ -5659,7 +5673,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Χρόνος εν λειτουργία"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Χρήση <code>/etc/ethers</code>"
 
@@ -5770,7 +5784,7 @@ msgstr ""
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5819,7 +5833,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5897,10 +5911,6 @@ msgid ""
 "and ad-hoc mode) to be installed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr ""
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5935,9 +5945,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Ασύρματο"
 
@@ -5985,7 +5995,7 @@ msgstr "Το ασύρματο δίκτυο είναι ανενεργό"
 msgid "Wireless network is enabled"
 msgstr "Το ασύρματο δίκτυο είναι ενεργό"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Καταγραφή των ληφθέντων DNS αιτήσεων στο syslog"
 
@@ -6015,9 +6025,9 @@ msgstr ""
 "><strong>Προειδοποίηση: Αν απενεργοποιήσετε απαραίτητα σενάρια εκκίνησης "
 "όπως το \"network\", η συσκευή σας μπορεί να καταστεί μη-προσβάσιμη!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6039,7 +6049,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr ""
 
@@ -6130,13 +6140,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6190,7 +6201,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "τοπικό αρχείο <abbr title=\"Domain Name System\">DNS</abbr>"
 
@@ -6227,16 +6238,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "κλειστό"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "ανοιχτό"
@@ -6314,8 +6325,9 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6343,6 +6355,7 @@ msgid "untagged"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6355,6 +6368,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6383,6 +6397,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6442,6 +6457,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6467,6 +6485,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6514,6 +6533,13 @@ msgstr "ναι"
 msgid "« Back"
 msgstr "« Πίσω"
 
+#, fuzzy
+#~ msgid "Bad address specified!"
+#~ msgstr "Μη έγκυρη διεύθυνση!"
+
+#~ msgid "Loading"
+#~ msgstr "Φόρτωση"
+
 #~ msgid "Realtime Connections"
 #~ msgstr "Συνδέσεις πραγματικού χρόνου"
 
diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index 4ba87b632..a372a973b 100644
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -42,6 +42,8 @@ msgstr "(%d minute window, %d second interval)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -148,15 +150,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -168,7 +170,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
@@ -195,12 +197,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 
@@ -208,16 +211,16 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -225,7 +228,7 @@ msgstr ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -233,7 +236,7 @@ msgstr ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 
@@ -352,6 +355,7 @@ msgstr "Active Connections"
 msgid "Active DHCP Leases"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr ""
@@ -407,7 +411,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Add local domain suffix to names served from hosts files"
 
@@ -420,11 +424,11 @@ msgstr "Add new interface..."
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Additional Hosts files"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -445,12 +449,13 @@ msgstr "Address"
 msgid "Address to access local relay bridge"
 msgstr "Address to access local relay bridge"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administration"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -479,17 +484,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -513,7 +518,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr "Allow listed only"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Allow localhost"
 
@@ -529,7 +534,7 @@ msgstr "Allow root logins with password"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Allow the <em>root</em> user to login with password"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -701,7 +706,7 @@ msgstr "Authentication"
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Authoritative"
 
@@ -709,11 +714,11 @@ msgstr "Authoritative"
 msgid "Authorization Required"
 msgstr "Authorization Required"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -807,6 +812,7 @@ msgid "Backup"
 msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Backup / Flash Firmware"
 
@@ -815,10 +821,6 @@ msgstr "Backup / Flash Firmware"
 msgid "Backup file list"
 msgstr "Backup file list"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Bad address specified!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -839,7 +841,7 @@ msgstr ""
 "configuration files marked by opkg, essential base files and the user "
 "defined backup patterns."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -859,7 +861,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Bogus NX Domain Override"
 
@@ -1053,10 +1055,11 @@ msgid "Close list..."
 msgstr "Close list..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Collecting data..."
 
@@ -1085,7 +1088,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Configuration"
@@ -1125,7 +1127,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Connections"
 
@@ -1220,8 +1222,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr "DHCP Server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP and DNS"
 
@@ -1256,7 +1258,7 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "DNS forwardings"
 
@@ -1264,11 +1266,11 @@ msgstr "DNS forwardings"
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1297,6 +1299,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1438,8 +1441,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Diagnostics"
 
@@ -1496,7 +1498,7 @@ msgstr "Disabled"
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
@@ -1530,7 +1532,7 @@ msgstr "Distance Optimization"
 msgid "Distance to farthest network member in meters."
 msgstr "Distance to farthest network member in meters."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1542,15 +1544,15 @@ msgstr ""
 "Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
 "firewalls"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1570,11 +1572,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Domain required"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr ""
 
@@ -1582,7 +1584,7 @@ msgstr ""
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1728,7 +1730,7 @@ msgstr ""
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr ""
 
@@ -1848,11 +1850,11 @@ msgstr "Ethernet Adapter"
 msgid "Ethernet Switch"
 msgstr "Ethernet Switch"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr ""
 
@@ -1861,6 +1863,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1937,7 +1946,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1946,11 +1955,11 @@ msgstr ""
 msgid "Filesystem"
 msgstr "Filesystem"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Filter private"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Filter useless"
 
@@ -1973,7 +1982,7 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -1997,7 +2006,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2125,7 +2134,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2164,9 +2173,9 @@ msgstr ""
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr ""
@@ -2219,6 +2228,7 @@ msgstr "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2242,7 +2252,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2255,7 +2265,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Hostnames"
 
@@ -2293,13 +2303,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
@@ -2367,6 +2377,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2377,8 +2389,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2448,6 +2458,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2544,7 +2555,7 @@ msgstr ""
 "slow process as the swap-device cannot be accessed with the high datarates "
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignore <code>/etc/hosts</code>"
 
@@ -2552,7 +2563,7 @@ msgstr "Ignore <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Ignore interface"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Ignore resolve file"
 
@@ -2604,10 +2615,6 @@ msgstr "Initscript"
 msgid "Initscripts"
 msgstr "Initscripts"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr ""
@@ -2669,7 +2676,7 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Interfaces"
 
@@ -2727,9 +2734,9 @@ msgstr ""
 "It appears that you try to flash an image that does not fit into the flash "
 "memory, please verify the image file!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr ""
@@ -2750,8 +2757,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Kernel Log"
 
@@ -2827,16 +2834,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Leasefile"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2863,11 +2871,11 @@ msgstr ""
 msgid "Limit"
 msgstr "Limit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2891,7 +2899,7 @@ msgstr ""
 msgid "Link On"
 msgstr "Link On"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2919,15 +2927,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2939,12 +2947,12 @@ msgstr ""
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Load"
 
@@ -2952,10 +2960,6 @@ msgstr "Load"
 msgid "Load Average"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -2988,7 +2992,7 @@ msgstr ""
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -3001,31 +3005,31 @@ msgstr ""
 msgid "Local Time"
 msgstr "Local Time"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Localise queries"
 
@@ -3033,7 +3037,7 @@ msgstr "Localise queries"
 msgid "Log output level"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Log queries"
 
@@ -3045,7 +3049,7 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Logout"
 
@@ -3142,15 +3146,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
@@ -3290,6 +3294,7 @@ msgstr "Mount Point"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Mount Points"
 
@@ -3383,11 +3388,10 @@ msgstr "Name"
 msgid "Name of the new network"
 msgstr "Name of the new network"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navigation"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3395,14 +3399,15 @@ msgstr "Navigation"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Network"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr ""
 
@@ -3460,13 +3465,13 @@ msgstr ""
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr ""
@@ -3512,7 +3517,7 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3554,11 +3559,11 @@ msgstr ""
 msgid "Notice"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3605,7 +3610,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
@@ -3780,7 +3785,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Overview"
 
@@ -4008,8 +4013,9 @@ msgstr ""
 msgid "Physical Settings"
 msgstr "Physical Settings"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4085,7 +4091,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4098,7 +4104,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Processes"
 
@@ -4155,7 +4161,7 @@ msgstr ""
 msgid "Quality"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4222,7 +4228,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4234,7 +4240,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr ""
 
@@ -4242,12 +4248,13 @@ msgstr ""
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reboot"
 
@@ -4375,7 +4382,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4421,11 +4428,11 @@ msgstr "Reset Counters"
 msgid "Reset to defaults"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr ""
 
@@ -4477,7 +4484,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4503,12 +4510,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Routes"
 
@@ -4546,6 +4554,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4563,6 +4572,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4607,6 +4617,7 @@ msgstr "Scan"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Scheduled Tasks"
 
@@ -4646,7 +4657,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr ""
 
@@ -4659,7 +4670,7 @@ msgstr ""
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Services"
 
@@ -4750,7 +4761,7 @@ msgstr ""
 msgid "Size"
 msgstr "Size"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4763,11 +4774,11 @@ msgstr ""
 msgid "Skip"
 msgstr "Skip"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Skip to content"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Skip to navigation"
 
@@ -4868,6 +4879,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4879,11 +4891,11 @@ msgstr "Static IPv4 Routes"
 msgid "Static IPv6 Routes"
 msgstr "Static IPv6 Routes"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Static Leases"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Static Routes"
 
@@ -4893,7 +4905,7 @@ msgstr "Static Routes"
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4904,10 +4916,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Status"
 
@@ -4917,7 +4929,7 @@ msgstr "Status"
 msgid "Stop"
 msgstr "Stop"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Strict order"
 
@@ -4930,11 +4942,11 @@ msgstr ""
 msgid "Submit"
 msgstr "Submit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4943,7 +4955,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Switch"
 
@@ -4991,15 +5003,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "System"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "System Log"
 
@@ -5015,11 +5028,11 @@ msgstr ""
 msgid "TCP:"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr ""
 
@@ -5246,7 +5259,8 @@ msgstr ""
 "The uploaded image file does not contain a supported format. Make sure that "
 "you choose the generic image format for your platform."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5256,9 +5270,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5277,7 +5291,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5310,7 +5324,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5385,14 +5399,15 @@ msgstr ""
 msgid "Total Available"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Traffic"
 
@@ -5620,7 +5635,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Uptime"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Use <code>/etc/ethers</code>"
 
@@ -5731,7 +5746,7 @@ msgstr ""
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5780,7 +5795,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5860,10 +5875,6 @@ msgstr ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr ""
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5898,9 +5909,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr ""
 
@@ -5948,7 +5959,7 @@ msgstr ""
 msgid "Wireless network is enabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
@@ -5977,9 +5988,9 @@ msgstr ""
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
 "scripts like \"network\", your device might become inaccessible!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6001,7 +6012,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr ""
 
@@ -6090,13 +6101,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6150,7 +6162,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 
@@ -6187,16 +6199,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr ""
@@ -6274,8 +6286,9 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6303,6 +6316,7 @@ msgid "untagged"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6315,6 +6329,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6343,6 +6358,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6402,6 +6418,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6427,6 +6446,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6474,6 +6494,9 @@ msgstr ""
 msgid "« Back"
 msgstr "« Back"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Bad address specified!"
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Assign interfaces..."
 
diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index e866ee00a..f5b337326 100644
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -43,6 +43,8 @@ msgstr "(ventana de %d minutos, intervalo de %d segundos)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -151,15 +153,15 @@ msgstr "Tiempo de espera de reintento de 802.11w"
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "Puerto de consultas al <abbr title=\"Domain Name System\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "Puerto del servidor <abbr title=\"Domain Name System\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -171,7 +173,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Dirección <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -199,12 +201,13 @@ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 "Puerta de enlace <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr "Sufijo (hex)<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuración de <abbr title=\"Light Emitting Diode\">LEDs</abbr>"
 
@@ -212,16 +215,16 @@ msgstr "Configuración de <abbr title=\"Light Emitting Diode\">LEDs</abbr>"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Nombre del <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Dirección <abbr title=\"Media Access Control\">MAC</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -229,7 +232,7 @@ msgstr ""
 "Máximas conexiones <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -237,7 +240,7 @@ msgstr ""
 "Máx. tamaño del paquete <abbr title=\"maximal\"></abbr> <abbr title="
 "\"Extension Mechanisms for Domain Name System\">EDNS0</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"Maximal\">Máx.</abbr> consultas simultáneas"
 
@@ -360,6 +363,7 @@ msgstr "Conexiones activas"
 msgid "Active DHCP Leases"
 msgstr "Clientes DHCP activos"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Clientes DHCPv6 activos"
@@ -415,7 +419,7 @@ msgstr "Añadir instancia"
 msgid "Add key"
 msgstr "Añadir clave"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "Añadir el sufijo de dominio local a los nombres servidos desde el archivo de "
@@ -430,11 +434,11 @@ msgstr "Añadir nueva interfaz..."
 msgid "Add peer"
 msgstr "Añadir par"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Archivos de hosts adicionales"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "Archivo de servidores adicionales"
 
@@ -455,12 +459,13 @@ msgstr "Dirección"
 msgid "Address to access local relay bridge"
 msgstr "Dirección del puente relé local"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administración"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -489,11 +494,11 @@ msgstr "Apodo de interfaz"
 msgid "Alias of \"%s\""
 msgstr "Apodo de \"%s\""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr "Todos los servidores"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
@@ -501,7 +506,7 @@ msgstr ""
 "Asigna direcciones IP secuencialmente, comenzando desde la dirección más "
 "baja disponible"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr "Asignar IPs secuencialmente"
 
@@ -528,7 +533,7 @@ msgstr "Permitir tasas de 802.11b heredadas"
 msgid "Allow listed only"
 msgstr "Permitir a los pertenecientes en la lista"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Permitir host local"
 
@@ -546,7 +551,7 @@ msgstr "Permitir conexiones a root con contraseña"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Permitir al usuario <em>root</em> conectar con contraseña"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -728,7 +733,7 @@ msgstr "Autenticación"
 msgid "Authentication Type"
 msgstr "Tipo de autenticación"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Autorizar"
 
@@ -736,11 +741,11 @@ msgstr "Autorizar"
 msgid "Authorization Required"
 msgstr "Autorización requerida"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -836,6 +841,7 @@ msgid "Backup"
 msgstr "Copia de seguridad"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Copia de seguridad / Grabar firmware"
 
@@ -844,10 +850,6 @@ msgstr "Copia de seguridad / Grabar firmware"
 msgid "Backup file list"
 msgstr "Copia de seguridad de la lista de archivos"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "¡Dirección no válida!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -869,7 +871,7 @@ msgstr ""
 "esenciales base y los patrones de copia de seguridad definidos por el "
 "usuario."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -891,7 +893,7 @@ msgstr "Enlazar el túnel a esta interfaz (opcional)."
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Ignorar dominio falso NX"
 
@@ -1090,10 +1092,11 @@ msgid "Close list..."
 msgstr "Cerrar lista..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Recolectando datos…"
 
@@ -1127,7 +1130,6 @@ msgstr ""
 "especialmente en entornos con una gran carga de tráfico."
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Configuración"
@@ -1167,7 +1169,7 @@ msgstr "Intento de conexión fallido"
 msgid "Connection lost"
 msgstr "Conexión perdida"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Conexiones"
 
@@ -1268,8 +1270,8 @@ msgstr "Secreto DAE"
 msgid "DHCP Server"
 msgstr "Servidor DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP y DNS"
 
@@ -1304,7 +1306,7 @@ msgstr "Servicio DHCPv6"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "Reenvíos DNS"
 
@@ -1312,11 +1314,11 @@ msgstr "Reenvíos DNS"
 msgid "DNS-Label / FQDN"
 msgstr "Etiqueta DNS / FQDN"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr "Comprobación DNSSEC sin firmar"
 
@@ -1345,6 +1347,7 @@ msgstr "Modo de línea DSL"
 msgid "DTIM Interval"
 msgstr "Intervalo DTIM"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1486,8 +1489,7 @@ msgstr "Dispositivo inalcanzable!"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "Dispositivo inalcanzable! Todavía esperando al dispositivo..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Diagnósticos"
 
@@ -1546,7 +1548,7 @@ msgstr "Desactivado"
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Desasociarse en un reconocimiento bajo"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Descartar respuestas RFC1918 salientes"
 
@@ -1580,7 +1582,7 @@ msgstr "Optimización de distancia"
 msgid "Distance to farthest network member in meters."
 msgstr "Distancia en metros al miembro mas lejano de la red."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1592,17 +1594,17 @@ msgstr ""
 "Name System\">DNS</abbr> para Firewalls <abbr title=\"Network Address "
 "Translation\">NAT</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr "No guardar respuestas negativas, por ejemplo dominios inexistentes"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "No reenviar peticiones que no se puedan responder por servidores de nombres "
 "públicos"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "No reenviar búsquedas inversas para redes locales"
 
@@ -1622,11 +1624,11 @@ msgstr "¿Realmente quieres borrar todos las configuraciones?"
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr "¿Realmente desea eliminar recursivamente el directorio \"%s\" ?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Requerir dominio"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Lista blanca de dominios"
 
@@ -1634,7 +1636,7 @@ msgstr "Lista blanca de dominios"
 msgid "Don't Fragment"
 msgstr "No fragmentar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1786,7 +1788,7 @@ msgstr "Activar cliente NTP"
 msgid "Enable Single DES"
 msgstr "Activar sólo DES"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Activar servidor TFTP"
 
@@ -1909,11 +1911,11 @@ msgstr "Adaptador ethernet"
 msgid "Ethernet Switch"
 msgstr "Switch ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr "Excluir interfaces"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Expandir hosts"
 
@@ -1922,6 +1924,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr "Esperando una pista de asignación hexadecimal"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr "Esperando: %s"
 
@@ -2002,7 +2011,7 @@ msgstr "Archivo no accesible"
 msgid "Filename"
 msgstr "Nombre del archivo"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "Nombre del archivo de imagen de arranque mostrado a los clientes"
 
@@ -2011,11 +2020,11 @@ msgstr "Nombre del archivo de imagen de arranque mostrado a los clientes"
 msgid "Filesystem"
 msgstr "Sistema de archivos"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Filtro privado"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Filtro inútil"
 
@@ -2041,7 +2050,7 @@ msgstr "Encontrar y unirse a red"
 msgid "Finish"
 msgstr "Terminar"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -2065,7 +2074,7 @@ msgstr "Archivo de firmware"
 msgid "Firmware Version"
 msgstr "Versión del firmware"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Puerto origen fijo para peticiones de DNS salientes"
 
@@ -2195,7 +2204,7 @@ msgstr "La dirección de la puerta de enlace es inválida"
 msgid "Gateway metric"
 msgstr "Métrica de puerta de enlace"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2236,9 +2245,9 @@ msgstr "Configuración global"
 msgid "Global network options"
 msgstr "Opciones globales de red"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Ir a la configuración de la contraseña..."
@@ -2291,6 +2300,7 @@ msgstr "Ocultar <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgid "Hide empty chains"
 msgstr "Ocultar cadenas vacias"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2314,7 +2324,7 @@ msgid "Host-Uniq tag content"
 msgstr "Contenido de la etiqueta Host-Uniq"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2327,7 +2337,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "Nombre del host a enviar cuando se solicite una IP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Nombres de hosts"
 
@@ -2365,13 +2375,13 @@ msgstr "Dirección IP inválida"
 msgid "IP address is missing"
 msgstr "Falta la dirección IP"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2439,6 +2449,8 @@ msgstr "IPv4 en IPv4 (RFC2003)"
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr "IPv4/IPv6 (ambos: el valor predeterminado es IPv4)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2449,8 +2461,6 @@ msgstr "IPv4/IPv6 (ambos: el valor predeterminado es IPv4)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2520,6 +2530,7 @@ msgstr "Prefijo IPv6 enrutado"
 msgid "IPv6 suffix"
 msgstr "Sufijo IPv6"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2622,7 +2633,7 @@ msgstr ""
 "transferir volúmenes de información a alta velocidad tal y como hace la "
 "<abbr title=\"Random Access Memory\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorar <code>/etc/hosts</code>"
 
@@ -2630,7 +2641,7 @@ msgstr "Ignorar <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Desactivar DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Ignorar el archivo resolve"
 
@@ -2685,10 +2696,6 @@ msgstr "Nombre del script de inicio"
 msgid "Initscripts"
 msgstr "Scripts de inicio"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr "Instale \"iputils-traceroute6\" para Traceroute IPv6"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Instalar extensiones de protocolo..."
@@ -2750,7 +2757,7 @@ msgstr "La interfaz no existe o no está aún conectado."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Interfaces"
 
@@ -2807,9 +2814,9 @@ msgstr ""
 "Parece que está intentando grabar una imagen de firmware mayor que la "
 "memoria flash de su equipo. ¡Por favor, verifique el archivo!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "¡Se necesita JavaScript!"
@@ -2830,8 +2837,8 @@ msgstr "Conectarse a: %q"
 msgid "Keep settings and retain the current configuration"
 msgstr "Mantener los ajustes y conservar la configuración actual"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Registro del Kernel"
 
@@ -2907,16 +2914,17 @@ msgstr "Latencia"
 msgid "Leaf"
 msgstr "Hoja"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "Tiempo de expiración"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Archivo de conexiones"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2943,13 +2951,13 @@ msgstr "Registro de cambios:"
 msgid "Limit"
 msgstr "Límite de IPs"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 "Limita el servicio de DNS a las subredes de interfaces en las que estamos "
 "sirviendo DNS."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "Limita la escucha de estas interfaces, y el bucle de retorno."
 
@@ -2973,7 +2981,7 @@ msgstr "Tiempo de actividad de línea"
 msgid "Link On"
 msgstr "Enlace conectado"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -3014,15 +3022,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr "Lista de archivos de claves SSH para autenticación"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Lista de dominios a los que se permiten respuestas RFC1918"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "Lista de dispositivos que proporcionan resultados de dominio NX falsos"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr "Interfaces de escucha"
 
@@ -3034,12 +3042,12 @@ msgstr "Puerto"
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr "Escucha solo en la interfaz dada o, si no se especifica, en todas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Puerto de escucha para consultas DNS entrantes"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Cargar"
 
@@ -3047,10 +3055,6 @@ msgstr "Cargar"
 msgid "Load Average"
 msgstr "Carga media"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Cargando"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr "Cargando el contenido del directorio…"
@@ -3083,7 +3087,7 @@ msgstr "Dirección local IPv4"
 msgid "Local IPv6 address"
 msgstr "Dirección local IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr "Solo servicio local"
 
@@ -3096,11 +3100,11 @@ msgstr "Arranque local"
 msgid "Local Time"
 msgstr "Hora local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Dominio local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3108,17 +3112,17 @@ msgstr ""
 "Especificación de dominio local. Los nombres que coinciden con este dominio "
 "nunca se reenvían y se resuelven solo desde archivos DHCP o hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 "Sufijo del dominio local que se añade a los nombres DHCP y a las entradas "
 "del archivo de dispositivos"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Servidor local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3126,7 +3130,7 @@ msgstr ""
 "Localice el nombre del host en función de la subred que solicita si hay "
 "varias IP disponibles"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Localizar consultas"
 
@@ -3134,7 +3138,7 @@ msgstr "Localizar consultas"
 msgid "Log output level"
 msgstr "Nivel de registro"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Registrar consultas"
 
@@ -3146,7 +3150,7 @@ msgstr "Inicio de sesión"
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Cerrar sesión"
 
@@ -3245,15 +3249,15 @@ msgstr "Max. velocidad de datos alcanzable (ATTNDR)"
 msgid "Maximum allowed Listen Interval"
 msgstr "Máximo permitido de intervalo de escucha"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Número máximo permitido de clientes DHCP activos"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Número máximo de consultas DNS concurrentes"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Tamaño máximo de paquetes EDNS.0 paquetes UDP"
 
@@ -3393,6 +3397,7 @@ msgstr "Punto de montaje"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Puntos de montaje"
 
@@ -3486,11 +3491,10 @@ msgstr "Nombre"
 msgid "Name of the new network"
 msgstr "Nombre de la nueva red"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navegación"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3498,14 +3502,15 @@ msgstr "Navegación"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Red"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Utilidades de red"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Imagen de arranque en red"
 
@@ -3563,13 +3568,13 @@ msgstr "No hay información disponible"
 msgid "No matching prefix delegation"
 msgstr "No hay delegación de prefijo coincidente"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Sin caché negativa"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "¡Sin contraseña!"
@@ -3615,7 +3620,7 @@ msgstr "Ruido:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "Errores de CRC no preventivos (CRC P)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr "Sin comodín"
 
@@ -3657,11 +3662,11 @@ msgstr "No soportado"
 msgid "Notice"
 msgstr "Aviso"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "NSLookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 "Número de entradas de DNS en caché (el máximo es 10000, 0 es sin "
@@ -3710,7 +3715,7 @@ msgstr "Ruta en enlace"
 msgid "On-State Delay"
 msgstr "Retraso de activación"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "¡Debe especificar al menos un nombre de host o dirección MAC!"
 
@@ -3900,7 +3905,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr "Anular la tabla utilizada para rutas internas"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Vista general"
 
@@ -4128,8 +4133,9 @@ msgstr "Ratio Phy:"
 msgid "Physical Settings"
 msgstr "Configuración física"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ping"
 
@@ -4207,7 +4213,7 @@ msgstr ""
 "Asumir que el otro estará muerto tras estos fallos de echo LCP, use 0 para "
 "ignorar fallos"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr "Evita escuchar en estas interfaces."
 
@@ -4220,7 +4226,7 @@ msgid "Private Key"
 msgstr "Clave privada"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Procesos"
 
@@ -4284,7 +4290,7 @@ msgstr "QMI Celular"
 msgid "Quality"
 msgstr "Calidad"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4355,7 +4361,7 @@ msgstr ""
 "Bytes en bruto codificados en hexadecimal. Deje en blanco a menos que su ISP "
 "lo requiera"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4367,7 +4373,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "¿Está seguro de querer cambiar el protocolo?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Gráficos en tiempo real"
 
@@ -4375,12 +4381,13 @@ msgstr "Gráficos en tiempo real"
 msgid "Reassociation Deadline"
 msgstr "Fecha límite de reasociación"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "Protección contra reasociación"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reiniciar"
 
@@ -4513,7 +4520,7 @@ msgstr ""
 "Requiere la versión completa de wpad/hostapd y soporte del controlador de "
 "wifi <br />(a partir de enero de 2019: ath9k, ath10k, mwlwifi y mt76)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4561,11 +4568,11 @@ msgstr "Reiniciar contadores"
 msgid "Reset to defaults"
 msgstr "Reiniciar a configuraciones predeterminadas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Archivos Resolv y Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Archivo de resolución"
 
@@ -4617,7 +4624,7 @@ msgstr "Error al revertir la solicitud con el estado <code>%h</code>"
 msgid "Reverting configuration…"
 msgstr "Revirtiendo configuración…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Directorio raíz para los archivos servidos por TFTP"
 
@@ -4643,12 +4650,13 @@ msgstr "Servicio de anuncio de enrutador"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Contraseña del router"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Rutas"
 
@@ -4686,6 +4694,7 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Acceso SSH"
 
@@ -4703,6 +4712,7 @@ msgstr "Nombre de usuario SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Claves SSH"
 
@@ -4747,6 +4757,7 @@ msgstr "Escanear"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Tareas programadas"
 
@@ -4791,7 +4802,7 @@ msgstr ""
 "Enviar peticiones de echo LCP cada intervalo de segundos dado, solo efectivo "
 "usado conjuntamente con el umbral de fallo"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Configuración del servidor"
 
@@ -4804,7 +4815,7 @@ msgstr "Nombre del servicio"
 msgid "Service Type"
 msgstr "Tipo de servicio"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Servicios"
 
@@ -4898,7 +4909,7 @@ msgstr "Señal:"
 msgid "Size"
 msgstr "Tamaño"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr "Tamaño de la caché de consultas DNS"
 
@@ -4911,11 +4922,11 @@ msgstr "Tamaño del dispositivo ZRam en megabytes"
 msgid "Skip"
 msgstr "Saltar"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Saltar al contenido"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Saltar a navegación"
 
@@ -5030,6 +5041,7 @@ msgstr "Iniciando escaneo de WiFi..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Arranque"
 
@@ -5041,11 +5053,11 @@ msgstr "Rutas IPv4 estáticas"
 msgid "Static IPv6 Routes"
 msgstr "Rutas IPv6 estáticas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Direcciones estáticas"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Rutas estáticas"
 
@@ -5055,7 +5067,7 @@ msgstr "Rutas estáticas"
 msgid "Static address"
 msgstr "Dirección estática"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -5070,10 +5082,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr "Límite de inactividad de la estación"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Estado"
 
@@ -5083,7 +5095,7 @@ msgstr "Estado"
 msgid "Stop"
 msgstr "Detener"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Orden estricto"
 
@@ -5096,11 +5108,11 @@ msgstr "Fuerte"
 msgid "Submit"
 msgstr "Enviar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr "Suprimir el registro"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Suprimir el registro de la operación rutinaria de estos protocolos"
 
@@ -5109,7 +5121,7 @@ msgid "Swap free"
 msgstr "Swap libre"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Switch"
 
@@ -5159,15 +5171,16 @@ msgstr "Sincronizar con el servidor NTP"
 msgid "Sync with browser"
 msgstr "Sincronizar con el navegador"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistema"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Registro del sistema"
 
@@ -5183,11 +5196,11 @@ msgstr "Tamaño del buffer de registro del sistema"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Configuración TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "Raíz del servidor TFTP"
 
@@ -5452,7 +5465,8 @@ msgstr ""
 "El archivo con la imagen de firmware subido no tiene un formato adecuado. "
 "Asegúrese de haber elegido la imagen correcta para su plataforma."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5462,9 +5476,9 @@ msgstr "No hay direcciones activas"
 msgid "There are no changes to apply"
 msgstr "No hay cambios para aplicar"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5485,7 +5499,7 @@ msgstr "Este tipo de autenticación no es aplicable al método EAP seleccionado.
 msgid "This does not look like a valid PEM file"
 msgstr "Esto no parece un archivo PEM válido"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5531,7 +5545,7 @@ msgstr ""
 "Esta es la dirección de punto final asignada por el broker del túnel, suele "
 "terminar con <code>...:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5609,14 +5623,15 @@ msgstr "Tono"
 msgid "Total Available"
 msgstr "Total disponible"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Traceroute"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Tráfico"
 
@@ -5849,7 +5864,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Tiempo de actividad"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Usar <code>/etc/ethers</code>"
 
@@ -5960,7 +5975,7 @@ msgstr "Usar métrica de puerta de enlace"
 msgid "Use routing table"
 msgstr "Usar tabla de rutas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -6015,7 +6030,7 @@ msgstr "VDSL"
 msgid "VLANs on %q"
 msgstr "VLANs en %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr "VPN"
 
@@ -6095,10 +6110,6 @@ msgstr ""
 "Para el encriptado WPA se necesita que estén instalados \"wpa_supplicant\" "
 "para el modo cliente y/o \"hostapd\" para los modos AP y ad-hoc."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "Esperando a que se complete el comando..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "Esperando al dispositivo..."
@@ -6136,9 +6147,9 @@ msgstr "Ancho de banda"
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "WiFi"
 
@@ -6186,7 +6197,7 @@ msgstr "Red WiFi desactivada"
 msgid "Wireless network is enabled"
 msgstr "Red WiFi activada"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Escribe las peticiones de DNS recibidas en el registro del sistema"
 
@@ -6218,9 +6229,9 @@ msgstr ""
 "<strong>Advertencia: Si desactivas los scripts de inicio esenciales como "
 "\"network\", ¡Tu dispositivo podría volverse inaccesible!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6243,7 +6254,7 @@ msgstr "Configuración de ZRam"
 msgid "ZRam Size"
 msgstr "Tamaño de ZRam"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "cualquiera"
 
@@ -6332,13 +6343,14 @@ msgstr "Desactivado"
 msgid "driver default"
 msgstr "Predeterminado por el controlador"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "expirado"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6392,7 +6404,7 @@ msgstr "clave entre 8 y 63 caracteres"
 msgid "key with either 5 or 13 characters"
 msgstr "clave de 5 o 13 caracteres"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Archivo <abbr title=\"Domain Name System\">DNS</abbr> local"
 
@@ -6429,16 +6441,16 @@ msgstr "No presente"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "Apagado"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "Encendido"
@@ -6516,8 +6528,9 @@ msgstr "valor único"
 msgid "unknown"
 msgstr "Desconocido"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6545,6 +6558,7 @@ msgid "untagged"
 msgstr "Desetiquetado"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr "dirección IP válida"
 
@@ -6557,6 +6571,7 @@ msgid "valid IPv4 CIDR"
 msgstr "IPv4 válido CIDR"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr "dirección IPv4 válida"
 
@@ -6585,6 +6600,7 @@ msgid "valid IPv6 CIDR"
 msgstr "IPv6 válido CIDR"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr "dirección IPv6 válida"
 
@@ -6644,6 +6660,9 @@ msgstr "host válido: puerto"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr "nombre de host válido"
 
@@ -6669,6 +6688,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr "puerto válido o rango de puertos (port1-port2)"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr "valor de puerto válido"
 
@@ -6716,6 +6736,18 @@ msgstr "Si"
 msgid "« Back"
 msgstr "« Volver"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "¡Dirección no válida!"
+
+#~ msgid "Install iputils-traceroute6 for IPv6 traceroute"
+#~ msgstr "Instale \"iputils-traceroute6\" para Traceroute IPv6"
+
+#~ msgid "Loading"
+#~ msgstr "Cargando"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "Esperando a que se complete el comando..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Asignar interfaces..."
 
diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po
index 0637190af..d7ef934ab 100644
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -43,6 +43,8 @@ msgstr "(fenêtre de %d minutes, intervalle de %d secondes)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -149,15 +151,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "Port des requêtes <abbr title=\"Domain Name System\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "Port du serveur <abbr title=\"Domain Name System\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -169,7 +171,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Adresse <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -196,7 +198,7 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Passerelle <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 "Suffixe <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> (en "
@@ -204,6 +206,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 "Configuration des <abbr title=\"Diode Électro-Luminescente\">DEL</abbr>s"
@@ -212,16 +215,16 @@ msgstr ""
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Nom de la <abbr title=\"Diode Électro-Luminescente\">DEL</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Adresse <abbr title=\"Media Access Control\">MAC</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr "<abbr title=\"DHCP Unique Identifier\">DUID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -229,7 +232,7 @@ msgstr ""
 "Nombre maximal de baux <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -237,7 +240,7 @@ msgstr ""
 "Taille maximale des paquets <abbr title=\"Extension Mechanisms for Domain "
 "Name System\">EDNS0</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "Nombre maximal de requêtes concurrentes"
 
@@ -363,6 +366,7 @@ msgstr "Connexions actives"
 msgid "Active DHCP Leases"
 msgstr "Bails DHCP actifs"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Bails DHCPv6 actifs"
@@ -418,7 +422,7 @@ msgstr "Ajouter une instance"
 msgid "Add key"
 msgstr "Ajouter une clé"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "Ajouter le suffixe du domaine local aux noms résolus d'après le fichier hosts"
@@ -432,11 +436,11 @@ msgstr "Ajout d'une nouvelle interface..."
 msgid "Add peer"
 msgstr "Ajouter un pair"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Fichiers hosts supplémetaires"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -457,12 +461,13 @@ msgstr "Adresse"
 msgid "Address to access local relay bridge"
 msgstr "Adresse pour accéder au pont-relais local"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administration"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -491,17 +496,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -527,7 +532,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr "Autoriser seulement ce qui est listé"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Autoriser l'hôte local"
 
@@ -546,7 +551,7 @@ msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 "Autoriser l'utilisateur <em>root</em> à se connecter avec un mot de passe"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -719,7 +724,7 @@ msgstr "Authentification"
 msgid "Authentication Type"
 msgstr "Type d'authentification"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Autoritaire"
 
@@ -727,11 +732,11 @@ msgstr "Autoritaire"
 msgid "Authorization Required"
 msgstr "Autorisation requise"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -825,6 +830,7 @@ msgid "Backup"
 msgstr "Sauvegarder"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Sauvegarde / Mise à jour du micrologiciel"
 
@@ -833,10 +839,6 @@ msgstr "Sauvegarde / Mise à jour du micrologiciel"
 msgid "Backup file list"
 msgstr "Liste des fichiers de sauvegarde"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Adresse spécifiée incorrecte !"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -857,7 +859,7 @@ msgstr ""
 "de configuration modifiés marqués par opkg, des fichiers de base essentiels, "
 "et des motifs de sauvegarde définis par l'utilisateur."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -877,7 +879,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr "Débit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Contourne les «  NX Domain » bogués"
 
@@ -1074,10 +1076,11 @@ msgid "Close list..."
 msgstr "Fermer la liste…"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Récupération des données…"
 
@@ -1106,7 +1109,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Configuration"
@@ -1146,7 +1148,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Connexions"
 
@@ -1241,8 +1243,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr "Serveur DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP et DNS"
 
@@ -1277,7 +1279,7 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "transmissions DNS"
 
@@ -1285,11 +1287,11 @@ msgstr "transmissions DNS"
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1318,6 +1320,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1459,8 +1462,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Diagnostics"
 
@@ -1519,7 +1521,7 @@ msgstr "Désactivé"
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Jeter les réponses en RFC1918 amont"
 
@@ -1553,7 +1555,7 @@ msgstr "Optimisation de la distance"
 msgid "Distance to farthest network member in meters."
 msgstr "Distance au membre du réseau le plus éloigné, en mètres."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1565,19 +1567,19 @@ msgstr ""
 "abbr> pour les pare-feu <abbr title=\"Network Address Translation\">NAT</"
 "abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 "Ne pas mettre en cache les réponses négatives, par ex. pour des domaines "
 "inexistants"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Ne pas transmettre les requêtes qui ne peuvent être résolues par les "
 "serveurs de noms publics"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 "Ne pas transmettre les requêtes de recherche inverse pour les réseaux locaux"
@@ -1598,11 +1600,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Domaine nécessaire"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Liste blanche de domaines"
 
@@ -1610,7 +1612,7 @@ msgstr "Liste blanche de domaines"
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1760,7 +1762,7 @@ msgstr "Activer client NTP"
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Activer le serveur TFTP"
 
@@ -1882,11 +1884,11 @@ msgstr "Module Ethernet"
 msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Étendre le nom d'hôte"
 
@@ -1895,6 +1897,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1973,7 +1982,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "Nom de fichier d'une image de démarrage publiée aux clients"
 
@@ -1982,11 +1991,11 @@ msgstr "Nom de fichier d'une image de démarrage publiée aux clients"
 msgid "Filesystem"
 msgstr "Système de fichiers"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Filtrer les requêtes privées"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Filtrer les requêtes inutiles"
 
@@ -2009,7 +2018,7 @@ msgstr "Cherche et rejoint un réseau"
 msgid "Finish"
 msgstr "Terminer"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Pare-feu"
 
@@ -2033,7 +2042,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Version du micrologiciel"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Port source fixe pour les requêtes DNS sortantes"
 
@@ -2161,7 +2170,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2202,9 +2211,9 @@ msgstr "Paramètres généraux"
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Aller à la configuration du mot de passe…"
@@ -2257,6 +2266,7 @@ msgstr "Cacher le <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2280,7 +2290,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2293,7 +2303,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "Nom d'hôte à envoyer dans une requête DHCP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Noms d'hôtes"
 
@@ -2331,13 +2341,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2405,6 +2415,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2415,8 +2427,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2486,6 +2496,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2585,7 +2596,7 @@ msgstr ""
 "d'échange, relevant la quantité de RAM disponible. Ce processus est lent car "
 "la mémoire d'échange ne peut être accédée aux taux de transfert de la RAM."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorer /etc/hosts"
 
@@ -2593,7 +2604,7 @@ msgstr "Ignorer /etc/hosts"
 msgid "Ignore interface"
 msgstr "Ignorer l'interface"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Ignorer le fichier de résolution"
 
@@ -2645,10 +2656,6 @@ msgstr "Script d'initialisation"
 msgid "Initscripts"
 msgstr "Scripts d'initialisation"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Installation des extensions de protocole…"
@@ -2710,7 +2717,7 @@ msgstr "L'interface n'est pas présente ou pas encore connectée."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Interfaces"
 
@@ -2770,9 +2777,9 @@ msgstr ""
 "L'image que vous essayez de flasher est vraisemblablement trop grosse pour "
 "tenir dans la mémoire flash, merci de vérifier le fichier !"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "Nécessite un Script Java !"
@@ -2793,8 +2800,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Journal du noyau"
 
@@ -2870,16 +2877,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Fichier de baux"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2906,11 +2914,11 @@ msgstr "Légende :"
 msgid "Limit"
 msgstr "Limite"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2934,7 +2942,7 @@ msgstr ""
 msgid "Link On"
 msgstr "Lien établi"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2964,16 +2972,16 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Liste des domaines où sont permises les réponses de type RFC1918"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 "Liste des hôtes qui fournissent des résultats avec des « NX domain » bogués"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2985,12 +2993,12 @@ msgstr ""
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr "Écouter seulement sur l'interface spécifié, sinon sur toutes"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Port d'écoute des requêtes DNS entrantes"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Charge"
 
@@ -2998,10 +3006,6 @@ msgstr "Charge"
 msgid "Load Average"
 msgstr "Charge moyenne"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Chargement"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -3034,7 +3038,7 @@ msgstr "Adresse IPv4 locale"
 msgid "Local IPv6 address"
 msgstr "Adresse IPv6 locale"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -3047,11 +3051,11 @@ msgstr "Démarrage local"
 msgid "Local Time"
 msgstr "Date"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Domaine local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3060,16 +3064,16 @@ msgstr ""
 "jamais transmis à un résolveur DNS, ils seront résolus seulement à partir du "
 "serveur DHCP ou des fichiers « hosts »"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 "Suffixe du domaine local ajouté aux noms du serveur DHCP et du fichier Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Serveur local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3077,7 +3081,7 @@ msgstr ""
 "Trouve le nom d'hôte suivant le sous-réseau d'où vient la requête si "
 "plusieurs adresses IPs sont possibles"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Localiser les requêtes"
 
@@ -3085,7 +3089,7 @@ msgstr "Localiser les requêtes"
 msgid "Log output level"
 msgstr "Niveau de journalisation"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Journaliser les requêtes"
 
@@ -3097,7 +3101,7 @@ msgstr "Journalisation"
 msgid "Login"
 msgstr "Connexion"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Déconnexion"
 
@@ -3196,15 +3200,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Nombre maximum de baux DHCP actifs"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Nombre maximum de requêtes DNS au même moment"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Taille maximum autorisée des paquets UDP EDNS.0"
 
@@ -3344,6 +3348,7 @@ msgstr "Point de montage"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Point de montage"
 
@@ -3437,11 +3442,10 @@ msgstr "Nom"
 msgid "Name of the new network"
 msgstr "Nom du nouveau réseau"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navigation"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3449,14 +3453,15 @@ msgstr "Navigation"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Réseau"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Utilitaires réseau"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Image de démarrage réseau"
 
@@ -3514,13 +3519,13 @@ msgstr "Information indisponible"
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Pas de cache négatif"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Pas de mot de passe positionné !"
@@ -3566,7 +3571,7 @@ msgstr "Bruit :"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3608,11 +3613,11 @@ msgstr ""
 msgid "Notice"
 msgstr "Remarque"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3659,7 +3664,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr "Durée allumée"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "Il faut indiquer un nom d'hôte ou une adresse MAC !"
 
@@ -3836,7 +3841,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr "Modifier la table utilisée pour les routes internes"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Vue d'ensemble"
 
@@ -4064,8 +4069,9 @@ msgstr "Débit physique :"
 msgid "Physical Settings"
 msgstr "Paramètres physiques"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ping"
 
@@ -4143,7 +4149,7 @@ msgstr ""
 "Suppose que le distant a disparu une fois le nombre donné d'erreurs d'échos "
 "LCP ; utiliser 0 pour ignorer ces erreurs"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4156,7 +4162,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Processus"
 
@@ -4213,7 +4219,7 @@ msgstr ""
 msgid "Quality"
 msgstr "Qualitée"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4280,7 +4286,7 @@ msgstr "Serveur de l'authentification Radius"
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4290,7 +4296,7 @@ msgstr "Lire /etc/ethers pour configurer le serveur DHCP"
 msgid "Really switch protocol?"
 msgstr "Voulez-vous vraiment changer de protocole ?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Graphiques temps-réel"
 
@@ -4298,12 +4304,13 @@ msgstr "Graphiques temps-réel"
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "Protection contre l'attaque « rebind »"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Redémarrage"
 
@@ -4431,7 +4438,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4477,11 +4484,11 @@ msgstr "Remise à zéro des compteurs"
 msgid "Reset to defaults"
 msgstr "Ré-initialisation"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Fichiers Resolv et Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Fichier de résolution des noms"
 
@@ -4533,7 +4540,7 @@ msgstr "La demande d'annulation a échoué, statut <code>%h</code>"
 msgid "Reverting configuration…"
 msgstr "Annulation de la configuration…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Répertoire racine des fichiers fournis par TFTP"
 
@@ -4559,12 +4566,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Mot de passe du routeur"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Routes"
 
@@ -4603,6 +4611,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Accès SSH"
 
@@ -4620,6 +4629,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Clés SSH"
 
@@ -4664,6 +4674,7 @@ msgstr "Scan"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Tâches Régulières"
 
@@ -4705,7 +4716,7 @@ msgstr ""
 "Envoyer des demandes d'échos LCP à intervalles donnés, en secondes ; utile "
 "uniqument associé à un seuil d'erreurs"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Paramètres du serveur"
 
@@ -4718,7 +4729,7 @@ msgstr "Nom du service"
 msgid "Service Type"
 msgstr "Type du service"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Services"
 
@@ -4809,7 +4820,7 @@ msgstr "Signal :"
 msgid "Size"
 msgstr "Taille"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4822,11 +4833,11 @@ msgstr ""
 msgid "Skip"
 msgstr "Passer au suivant"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Skip to content"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Skip to navigation"
 
@@ -4933,6 +4944,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Démarrage"
 
@@ -4944,11 +4956,11 @@ msgstr "Routes IPv4 statiques"
 msgid "Static IPv6 Routes"
 msgstr "Routes IPv6 statiques"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Baux Statiques"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Routes statiques"
 
@@ -4958,7 +4970,7 @@ msgstr "Routes statiques"
 msgid "Static address"
 msgstr "Adresse statique"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4973,10 +4985,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "État"
 
@@ -4986,7 +4998,7 @@ msgstr "État"
 msgid "Stop"
 msgstr "Arrêter"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Ordre stricte"
 
@@ -4999,11 +5011,11 @@ msgstr ""
 msgid "Submit"
 msgstr "Soumettre"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -5012,7 +5024,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Switch"
 
@@ -5060,15 +5072,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr "Synchro avec le navigateur"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Système"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Journal système"
 
@@ -5084,11 +5097,11 @@ msgstr "Taille du tampon du journal système"
 msgid "TCP:"
 msgstr "TCP :"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Paramètres TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "Racine du serveur TFTP"
 
@@ -5334,7 +5347,8 @@ msgstr ""
 "The uploaded image file does not contain a supported format. Make sure that "
 "you choose the generic image format for your platform."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5344,9 +5358,9 @@ msgstr "Aucun bail actif"
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5368,7 +5382,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5409,7 +5423,7 @@ msgstr ""
 "Il s'agit de l'adresse de l'extrémité locale attribuée par le fournisseur de "
 "tunnels, elle se termine habituellement avec <code>...:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5488,14 +5502,15 @@ msgstr ""
 msgid "Total Available"
 msgstr "Total disponible"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Traceroute"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Trafic"
 
@@ -5723,7 +5738,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Temps de service"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Utiliser /etc/ethers"
 
@@ -5834,7 +5849,7 @@ msgstr "Utiliser la métrique de la passerelle"
 msgid "Use routing table"
 msgstr "Utiliser la table de routage"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5887,7 +5902,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr "VLANs sur %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5967,10 +5982,6 @@ msgstr ""
 "Le chiffrage WPA nécessite l'installation du paquet wpa_supplicant (en mode "
 "client) ou hostapd (en mode Point d'accès ou Ad-hoc)."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "En attente que la commande se termine…"
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -6007,9 +6018,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Sans-fil"
 
@@ -6057,7 +6068,7 @@ msgstr "Le réseau Wi-Fi est désactivé"
 msgid "Wireless network is enabled"
 msgstr "Le réseau Wi-Fi est activé"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Écrire les requêtes DNS reçues dans syslog"
 
@@ -6087,9 +6098,9 @@ msgstr ""
 "><strong>Attention: Si vous désactivez des scripts essentiels comme \"réseau"
 "\", votre équipement pourrait ne plus être accessible&#160;!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6113,7 +6124,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "tous"
 
@@ -6202,13 +6213,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "expiré"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6260,7 +6272,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "fichier de résolution local"
 
@@ -6297,16 +6309,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "Arrêté"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "Actif"
@@ -6384,8 +6396,9 @@ msgstr ""
 msgid "unknown"
 msgstr "inconnu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6413,6 +6426,7 @@ msgid "untagged"
 msgstr "non marqué"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6425,6 +6439,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6453,6 +6468,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6512,6 +6528,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6537,6 +6556,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6584,6 +6604,15 @@ msgstr "oui"
 msgid "« Back"
 msgstr "« Retour"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Adresse spécifiée incorrecte !"
+
+#~ msgid "Loading"
+#~ msgstr "Chargement"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "En attente que la commande se termine…"
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Affecte les interfaces…"
 
diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po
index db33139c8..b241a9f70 100644
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -40,6 +40,8 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -146,15 +148,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> יציאת שאילתא"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> יציאת שרת"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -164,7 +166,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "כתובות <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -190,12 +192,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "הגדרות <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
@@ -203,28 +206,28 @@ msgstr "הגדרות <abbr title=\"Light Emitting Diode\">LED</abbr>"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "שם <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "כתובת-<abbr title=\"Media Access Control\">MAC</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
@@ -345,6 +348,7 @@ msgstr "חיבורים פעילים"
 msgid "Active DHCP Leases"
 msgstr "הרשאות DHCP פעילות"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "הרשאות DHCPv6 פעילות"
@@ -402,7 +406,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 #, fuzzy
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "הוסף דומיין מקומי לשמות המוגשים מהקבצים של המארח"
@@ -416,11 +420,11 @@ msgstr "הוסף ממשק חדש..."
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "קבצי מארח נוספים"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -441,13 +445,14 @@ msgstr "כתובת"
 msgid "Address to access local relay bridge"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 #, fuzzy
 msgid "Administration"
 msgstr "מנהלה"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -477,17 +482,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -512,7 +517,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr "אפשר רשומים בלבד"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 #, fuzzy
 msgid "Allow localhost"
 msgstr "אפשר localhost"
@@ -529,7 +534,7 @@ msgstr ""
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -702,7 +707,7 @@ msgstr "אימות"
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "מוסמך"
 
@@ -710,11 +715,11 @@ msgstr "מוסמך"
 msgid "Authorization Required"
 msgstr "דרוש אימות"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -808,6 +813,7 @@ msgid "Backup"
 msgstr "גיבוי"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "גיבוי / קושחת פלאש"
 
@@ -816,10 +822,6 @@ msgstr "גיבוי / קושחת פלאש"
 msgid "Backup file list"
 msgstr "גיבוי רשימת קבצים"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "פורטה כתובת לא תקינה"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -840,7 +842,7 @@ msgstr ""
 "המסומנים ב opkg ׁOpen PacKaGe Managementׂ, קבצי בסיס חיוניים ותבניות הגיבוי "
 "המוגדרות ע\"י המשתמש."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -860,7 +862,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr ""
 
@@ -1047,10 +1049,11 @@ msgid "Close list..."
 msgstr "סגור רשימה..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "אוסף מידע..."
 
@@ -1079,7 +1082,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "הגדרות"
@@ -1119,7 +1121,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "חיבורים"
 
@@ -1214,8 +1216,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr "שרת DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP ו- DNS"
 
@@ -1250,7 +1252,7 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr ""
 
@@ -1258,11 +1260,11 @@ msgstr ""
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1291,6 +1293,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1431,8 +1434,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "אבחון"
 
@@ -1489,7 +1491,7 @@ msgstr ""
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
@@ -1523,7 +1525,7 @@ msgstr ""
 msgid "Distance to farthest network member in meters."
 msgstr "מרחק לנק' הרשת הרחוקה ביותר במטרים"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1531,15 +1533,15 @@ msgid ""
 "firewalls"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1559,11 +1561,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr ""
 
@@ -1571,7 +1573,7 @@ msgstr ""
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1714,7 +1716,7 @@ msgstr ""
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "אפשר שרת TFTP"
 
@@ -1834,11 +1836,11 @@ msgstr ""
 msgid "Ethernet Switch"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr ""
 
@@ -1847,6 +1849,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1923,7 +1932,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1932,11 +1941,11 @@ msgstr ""
 msgid "Filesystem"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr ""
 
@@ -1959,7 +1968,7 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr ""
 
@@ -1983,7 +1992,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2111,7 +2120,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2150,9 +2159,9 @@ msgstr ""
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr ""
@@ -2203,6 +2212,7 @@ msgstr ""
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2226,7 +2236,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2239,7 +2249,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr ""
 
@@ -2277,13 +2287,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
@@ -2351,6 +2361,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2361,8 +2373,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr ""
@@ -2432,6 +2442,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2523,7 +2534,7 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
@@ -2531,7 +2542,7 @@ msgstr ""
 msgid "Ignore interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr ""
 
@@ -2583,10 +2594,6 @@ msgstr ""
 msgid "Initscripts"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr ""
@@ -2648,7 +2655,7 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr ""
 
@@ -2703,9 +2710,9 @@ msgid ""
 "flash memory, please verify the image file!"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr ""
@@ -2726,8 +2733,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr ""
 
@@ -2803,16 +2810,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2839,11 +2847,11 @@ msgstr ""
 msgid "Limit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2867,7 +2875,7 @@ msgstr ""
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2895,15 +2903,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2915,12 +2923,12 @@ msgstr ""
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "עומס"
 
@@ -2928,10 +2936,6 @@ msgstr "עומס"
 msgid "Load Average"
 msgstr "עומס ממוצע"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "טוען"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -2964,7 +2968,7 @@ msgstr "כתובת IPv4 מקומית"
 msgid "Local IPv6 address"
 msgstr "כתובת IPv6 מקומית"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -2977,31 +2981,31 @@ msgstr ""
 msgid "Local Time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "שרת מקומי"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr ""
 
@@ -3009,7 +3013,7 @@ msgstr ""
 msgid "Log output level"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr ""
 
@@ -3021,7 +3025,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr ""
 
@@ -3118,15 +3122,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
@@ -3266,6 +3270,7 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -3357,11 +3362,10 @@ msgstr "שם"
 msgid "Name of the new network"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3369,14 +3373,15 @@ msgstr ""
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr ""
 
@@ -3434,13 +3439,13 @@ msgstr ""
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "לא הוגדרה סיסמה!"
@@ -3486,7 +3491,7 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3528,11 +3533,11 @@ msgstr ""
 msgid "Notice"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3579,7 +3584,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
@@ -3754,7 +3759,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr ""
 
@@ -3982,8 +3987,9 @@ msgstr ""
 msgid "Physical Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4059,7 +4065,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4072,7 +4078,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr ""
 
@@ -4129,7 +4135,7 @@ msgstr ""
 msgid "Quality"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4196,7 +4202,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4206,7 +4212,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr ""
 
@@ -4214,12 +4220,13 @@ msgstr ""
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr ""
 
@@ -4347,7 +4354,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4393,11 +4400,11 @@ msgstr ""
 msgid "Reset to defaults"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr ""
 
@@ -4449,7 +4456,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4475,12 +4482,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr ""
 
@@ -4516,6 +4524,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4533,6 +4542,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4577,6 +4587,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr ""
 
@@ -4616,7 +4627,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr ""
 
@@ -4629,7 +4640,7 @@ msgstr ""
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "שירותים"
 
@@ -4720,7 +4731,7 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4733,11 +4744,11 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "דלג אל התוכן"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "דלג אל הניווט"
 
@@ -4840,6 +4851,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "אתחול"
 
@@ -4851,11 +4863,11 @@ msgstr "ניתובי IPv4 סטטיים"
 msgid "Static IPv6 Routes"
 msgstr "ניתובי IPv6 סטטיים"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "הקצאות סטטיות"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "ניתובים סטטיים"
 
@@ -4865,7 +4877,7 @@ msgstr "ניתובים סטטיים"
 msgid "Static address"
 msgstr "כתובת סטטית"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4879,10 +4891,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "מצב"
 
@@ -4892,7 +4904,7 @@ msgstr "מצב"
 msgid "Stop"
 msgstr "עצור"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr ""
 
@@ -4905,11 +4917,11 @@ msgstr ""
 msgid "Submit"
 msgstr "שלח"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4918,7 +4930,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr ""
 
@@ -4966,15 +4978,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr ""
 
@@ -4990,11 +5003,11 @@ msgstr ""
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "הגדרות TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr ""
 
@@ -5212,7 +5225,8 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5222,9 +5236,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5243,7 +5257,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5276,7 +5290,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5345,14 +5359,15 @@ msgstr ""
 msgid "Total Available"
 msgstr "סה\"כ פנוי"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "תעבורה"
 
@@ -5580,7 +5595,7 @@ msgstr ""
 msgid "Uptime"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr ""
 
@@ -5691,7 +5706,7 @@ msgstr ""
 msgid "Use routing table"
 msgstr "השתמש בטבלת ניתוב"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5740,7 +5755,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5818,10 +5833,6 @@ msgid ""
 "and ad-hoc mode) to be installed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr ""
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5856,9 +5867,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr ""
 
@@ -5906,7 +5917,7 @@ msgstr "רשת אלחוטית מנוטרלת"
 msgid "Wireless network is enabled"
 msgstr "רשת אלחוטית מאופשרת"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
@@ -5932,9 +5943,9 @@ msgid ""
 "scripts like \"network\", your device might become inaccessible!</strong>"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -5956,7 +5967,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "כלשהו"
 
@@ -6045,13 +6056,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6103,7 +6115,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 
@@ -6140,16 +6152,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "כבוי"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "פועל"
@@ -6227,8 +6239,9 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6256,6 +6269,7 @@ msgid "untagged"
 msgstr "לא מתויג"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6268,6 +6282,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6296,6 +6311,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6355,6 +6371,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6380,6 +6399,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6427,6 +6447,12 @@ msgstr "כן"
 msgid "« Back"
 msgstr "<< אחורה"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "פורטה כתובת לא תקינה"
+
+#~ msgid "Loading"
+#~ msgstr "טוען"
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "הקצה ממשקים"
 
diff --git a/modules/luci-base/po/hi/base.po b/modules/luci-base/po/hi/base.po
index 699f85a6e..1b44ef045 100644
--- a/modules/luci-base/po/hi/base.po
+++ b/modules/luci-base/po/hi/base.po
@@ -38,6 +38,8 @@ msgstr "(%d मिनट अवधि, %d पल मध्यांतर)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -144,15 +146,15 @@ msgstr "802.11 पुन: प्रयास काल समापन"
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -162,7 +164,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr ""
@@ -187,12 +189,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
@@ -200,28 +203,28 @@ msgstr ""
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
@@ -340,6 +343,7 @@ msgstr "सक्रिय संबंध"
 msgid "Active DHCP Leases"
 msgstr "सक्रिय DHCP पट्टों"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "सक्रिय DHCPv6 पट्टों"
@@ -395,7 +399,7 @@ msgstr "दृष्टांत जोड़ें"
 msgid "Add key"
 msgstr "चाबी जोड़ें"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
@@ -408,11 +412,11 @@ msgstr ""
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -433,12 +437,13 @@ msgstr ""
 msgid "Address to access local relay bridge"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -467,17 +472,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -501,7 +506,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr ""
 
@@ -517,7 +522,7 @@ msgstr ""
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -688,7 +693,7 @@ msgstr ""
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr ""
 
@@ -696,11 +701,11 @@ msgstr ""
 msgid "Authorization Required"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -794,6 +799,7 @@ msgid "Backup"
 msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -802,10 +808,6 @@ msgstr ""
 msgid "Backup file list"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr ""
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -823,7 +825,7 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -843,7 +845,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr ""
 
@@ -1029,10 +1031,11 @@ msgid "Close list..."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr ""
 
@@ -1061,7 +1064,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr ""
@@ -1101,7 +1103,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr ""
 
@@ -1194,8 +1196,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr ""
 
@@ -1230,7 +1232,7 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr ""
 
@@ -1238,11 +1240,11 @@ msgstr ""
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1271,6 +1273,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1409,8 +1412,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr ""
 
@@ -1467,7 +1469,7 @@ msgstr ""
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
@@ -1501,7 +1503,7 @@ msgstr ""
 msgid "Distance to farthest network member in meters."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1509,15 +1511,15 @@ msgid ""
 "firewalls"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1537,11 +1539,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr ""
 
@@ -1549,7 +1551,7 @@ msgstr ""
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1690,7 +1692,7 @@ msgstr ""
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr ""
 
@@ -1810,11 +1812,11 @@ msgstr ""
 msgid "Ethernet Switch"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr ""
 
@@ -1823,6 +1825,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1899,7 +1908,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1908,11 +1917,11 @@ msgstr ""
 msgid "Filesystem"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr ""
 
@@ -1935,7 +1944,7 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr ""
 
@@ -1959,7 +1968,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2087,7 +2096,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2126,9 +2135,9 @@ msgstr ""
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr ""
@@ -2179,6 +2188,7 @@ msgstr ""
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2202,7 +2212,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2215,7 +2225,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr ""
 
@@ -2253,13 +2263,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
@@ -2327,6 +2337,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2337,8 +2349,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr ""
@@ -2408,6 +2418,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2499,7 +2510,7 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
@@ -2507,7 +2518,7 @@ msgstr ""
 msgid "Ignore interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr ""
 
@@ -2559,10 +2570,6 @@ msgstr ""
 msgid "Initscripts"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr ""
@@ -2624,7 +2631,7 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr ""
 
@@ -2679,9 +2686,9 @@ msgid ""
 "flash memory, please verify the image file!"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr ""
@@ -2702,8 +2709,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr ""
 
@@ -2779,16 +2786,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2815,11 +2823,11 @@ msgstr ""
 msgid "Limit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2843,7 +2851,7 @@ msgstr ""
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2871,15 +2879,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2891,12 +2899,12 @@ msgstr ""
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr ""
 
@@ -2904,10 +2912,6 @@ msgstr ""
 msgid "Load Average"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -2940,7 +2944,7 @@ msgstr ""
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -2953,31 +2957,31 @@ msgstr ""
 msgid "Local Time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr ""
 
@@ -2985,7 +2989,7 @@ msgstr ""
 msgid "Log output level"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr ""
 
@@ -2997,7 +3001,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr ""
 
@@ -3094,15 +3098,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
@@ -3242,6 +3246,7 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -3333,11 +3338,10 @@ msgstr ""
 msgid "Name of the new network"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3345,14 +3349,15 @@ msgstr ""
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr ""
 
@@ -3410,13 +3415,13 @@ msgstr ""
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr ""
@@ -3462,7 +3467,7 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3504,11 +3509,11 @@ msgstr ""
 msgid "Notice"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3555,7 +3560,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
@@ -3730,7 +3735,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr ""
 
@@ -3958,8 +3963,9 @@ msgstr ""
 msgid "Physical Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4035,7 +4041,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4048,7 +4054,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr ""
 
@@ -4105,7 +4111,7 @@ msgstr ""
 msgid "Quality"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4172,7 +4178,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4182,7 +4188,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr ""
 
@@ -4190,12 +4196,13 @@ msgstr ""
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr ""
 
@@ -4323,7 +4330,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4369,11 +4376,11 @@ msgstr ""
 msgid "Reset to defaults"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr ""
 
@@ -4425,7 +4432,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4451,12 +4458,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr ""
 
@@ -4492,6 +4500,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4509,6 +4518,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4553,6 +4563,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr ""
 
@@ -4592,7 +4603,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr ""
 
@@ -4605,7 +4616,7 @@ msgstr ""
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr ""
 
@@ -4696,7 +4707,7 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4709,11 +4720,11 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr ""
 
@@ -4814,6 +4825,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4825,11 +4837,11 @@ msgstr ""
 msgid "Static IPv6 Routes"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr ""
 
@@ -4839,7 +4851,7 @@ msgstr ""
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4850,10 +4862,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr ""
 
@@ -4863,7 +4875,7 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr ""
 
@@ -4876,11 +4888,11 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4889,7 +4901,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr ""
 
@@ -4937,15 +4949,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr ""
 
@@ -4961,11 +4974,11 @@ msgstr ""
 msgid "TCP:"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr ""
 
@@ -5183,7 +5196,8 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5193,9 +5207,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5214,7 +5228,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5247,7 +5261,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5315,14 +5329,15 @@ msgstr ""
 msgid "Total Available"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr ""
 
@@ -5550,7 +5565,7 @@ msgstr ""
 msgid "Uptime"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr ""
 
@@ -5661,7 +5676,7 @@ msgstr ""
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5710,7 +5725,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5788,10 +5803,6 @@ msgid ""
 "and ad-hoc mode) to be installed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr ""
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5826,9 +5837,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr ""
 
@@ -5876,7 +5887,7 @@ msgstr ""
 msgid "Wireless network is enabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
@@ -5902,9 +5913,9 @@ msgid ""
 "scripts like \"network\", your device might become inaccessible!</strong>"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -5926,7 +5937,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr ""
 
@@ -6015,13 +6026,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6073,7 +6085,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 
@@ -6110,16 +6122,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr ""
@@ -6197,8 +6209,9 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6226,6 +6239,7 @@ msgid "untagged"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6238,6 +6252,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6266,6 +6281,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6325,6 +6341,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6350,6 +6369,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po
index 92fefd9b4..0649f7220 100644
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -41,6 +41,8 @@ msgstr "(%d perces ablak, %d másodperces időköz)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -147,15 +149,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> lekérdezési port"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-kiszolgáló portja"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -167,7 +169,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-cím"
@@ -194,12 +196,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-átjáró"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-utótag (hex)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> beállítása"
 
@@ -207,16 +210,16 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> beállítása"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Név"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-cím"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -224,7 +227,7 @@ msgstr ""
 "<abbr title=\"maximal\">Legnagyobb</abbr> <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr> bérletek"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -232,7 +235,7 @@ msgstr ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> csomagméret"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Legtöbb</abbr> egyidejű lekérdezés"
 
@@ -343,7 +346,8 @@ msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:97
 msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
-msgstr "Aktív <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-útvonalak"
+msgstr ""
+"Aktív <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-útvonalak"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js:80
 msgid "Active Connections"
@@ -354,6 +358,7 @@ msgstr "Aktív kapcsolatok"
 msgid "Active DHCP Leases"
 msgstr "Aktív DHCP bérletek"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Aktív DHCPv6 bérletek"
@@ -409,7 +414,7 @@ msgstr ""
 msgid "Add key"
 msgstr "Kulcs hozzáadása"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "Helyi tartomány utótag hozzáadása a hosts fájlokból kiszolgált nevekhez"
@@ -423,11 +428,11 @@ msgstr "Új csatoló hozzáadása…"
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "További 'hosts' fájlok"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "További kiszolgálók fájlja"
 
@@ -448,12 +453,13 @@ msgstr "Cím"
 msgid "Address to access local relay bridge"
 msgstr "Cím a helyi átjátszóhíd eléréséhez"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Adminisztráció"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -482,18 +488,18 @@ msgstr "Álnév csatoló"
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 "IP-címek lefoglalása sorrendben, kezdve a legalacsonyabb elérhető címtől"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr "IP lefoglalása egymás után"
 
@@ -518,7 +524,7 @@ msgstr "Örökölt 802.11b sebességek engedélyezése"
 msgid "Allow listed only"
 msgstr "Csak a felsoroltak engedélyezése"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Localhost engedélyezése"
 
@@ -536,7 +542,7 @@ msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 "Engedélyezés a <em>root</em> felhasználónak, hogy jelszóval jelentkezzen be"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -718,7 +724,7 @@ msgstr "Hitelesítés"
 msgid "Authentication Type"
 msgstr "Hitelesítés típusa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Hiteles"
 
@@ -726,11 +732,11 @@ msgstr "Hiteles"
 msgid "Authorization Required"
 msgstr "Hitelesítés szükséges"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -824,6 +830,7 @@ msgid "Backup"
 msgstr "Biztonsági mentés"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Mentés / Firmware frissítés"
 
@@ -832,10 +839,6 @@ msgstr "Mentés / Firmware frissítés"
 msgid "Backup file list"
 msgstr "Mentési fájl lista"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Hibás címet adott meg!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -857,7 +860,7 @@ msgstr ""
 "alapvető fájlokból, valamint a felhasználó által meghatározott biztonsági "
 "mentés mintákból áll."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -879,7 +882,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr "Bitsebesség"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Hamis NX-tartomány felülbírálása"
 
@@ -1081,10 +1084,11 @@ msgid "Close list..."
 msgstr "Lista bezárása..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Adatok összegyűjtése…"
 
@@ -1118,7 +1122,6 @@ msgstr ""
 "forgalomterheléssel rendelkező környezetekben."
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Beállítás"
@@ -1158,7 +1161,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Kapcsolatok"
 
@@ -1257,8 +1260,8 @@ msgstr "DAE-titok"
 msgid "DHCP Server"
 msgstr "DHCP kiszolgáló"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP és DNS"
 
@@ -1293,7 +1296,7 @@ msgstr "DHCPv6-szolgáltatás"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "DNS továbbítások"
 
@@ -1301,11 +1304,11 @@ msgstr "DNS továbbítások"
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr "DNSSEC ellenőrzés előjel nélkül"
 
@@ -1334,6 +1337,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr "DTIM időköze"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1474,8 +1478,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr "Az eszköz elérhetetlen! Még mindig az eszközre várunk…"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Diagnosztika"
 
@@ -1534,7 +1537,7 @@ msgstr "Letiltva"
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Beérkező RFC1918 DHCP válaszok elvetése. "
 
@@ -1568,29 +1571,29 @@ msgstr "Távolság optimalizáció"
 msgid "Distance to farthest network member in meters."
 msgstr "A hálózat legtávolabbi tagjának távolsága méterben."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 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 ""
-"A dnsmasq egy kombinált <abbr title=\"Dynamic Host Configuration Protocol\""
-">DHCP</abbr>-kiszolgáló és <abbr title=\"Domain Name System\">DNS</abbr>-"
+"A dnsmasq egy kombinált <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-kiszolgáló és <abbr title=\"Domain Name System\">DNS</abbr>-"
 "továbbító <abbr title=\"Network Address Translation\">NAT</abbr> tűzfalak "
 "számára"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 "Ne gyorsítótárazza a negatív válaszokat, például nem létező tartományoknál"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Ne továbbítsa a publikus név szerverek által nem megválaszolható kéréseket"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Ne továbbítson fordított keresési kéréseket a helyi hálózathoz"
 
@@ -1610,11 +1613,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Tartomány szükséges"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Tartomány fehérlista"
 
@@ -1622,7 +1625,7 @@ msgstr "Tartomány fehérlista"
 msgid "Don't Fragment"
 msgstr "Ne tördeljen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1775,7 +1778,7 @@ msgstr "NTP-kliens engedélyezése"
 msgid "Enable Single DES"
 msgstr "Egyszeres DES engedélyezése"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "TFTP kiszolgáló engedélyezése"
 
@@ -1897,11 +1900,11 @@ msgstr "Ethernet adapter"
 msgid "Ethernet Switch"
 msgstr "Ethernet kapcsoló"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr "Csatolók kizárása"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Gépek kinyitása"
 
@@ -1910,6 +1913,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1988,7 +1998,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "A kliensek részére közzétett betöltö kép fájlneve"
 
@@ -1997,11 +2007,11 @@ msgstr "A kliensek részére közzétett betöltö kép fájlneve"
 msgid "Filesystem"
 msgstr "Fájlrendszer"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Privát kérések szűrése"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Használhatatlan szűrése"
 
@@ -2026,7 +2036,7 @@ msgstr "Hálózatok keresése és csatlakozás"
 msgid "Finish"
 msgstr "Befejezés"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Tűzfal"
 
@@ -2050,7 +2060,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Firmware verziója"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Rögzített forrás port a kimenő DNS kérésekhez"
 
@@ -2182,7 +2192,7 @@ msgstr "Az átjáró címe érvénytelen"
 msgid "Gateway metric"
 msgstr "Átjáró mérőszáma"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2211,7 +2221,8 @@ msgstr "Archívum előállítása"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:75
 msgid "Given password confirmation did not match, password not changed!"
-msgstr "A megadott jelszó-megerősítés nem egyezett, a jelszó nem változott meg!"
+msgstr ""
+"A megadott jelszó-megerősítés nem egyezett, a jelszó nem változott meg!"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:145
 msgid "Global Settings"
@@ -2221,9 +2232,9 @@ msgstr ""
 msgid "Global network options"
 msgstr "Globális hálózati beállítások"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Ugrás a jelszó beállításhoz..."
@@ -2276,6 +2287,7 @@ msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr> elrejtése"
 msgid "Hide empty chains"
 msgstr "Üres láncok elrejtése"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2299,7 +2311,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2312,7 +2324,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "DHCP kérésekor küldendő gépnév"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Gépnevek"
 
@@ -2350,13 +2362,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr "IP-cím hiányzik"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2424,6 +2436,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr "IPv4/IPv6 (mindkettő – alapértelmezetten IPv4)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2434,8 +2448,6 @@ msgstr "IPv4/IPv6 (mindkettő – alapértelmezetten IPv4)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2505,6 +2517,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr "IPv6-utótag"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2604,10 +2617,10 @@ msgstr ""
 "áttehetők egy cserehelyeszközre, ami nagyobb mennyiségű használható <abbr "
 "title=\"Random Access Memory\">RAM</abbr>-ot eredményez. Legyen tudatában "
 "annak, hogy az adatok áttétele nagyon lassú folyamat, mivel a "
-"cserehelyeszköz nem érhető el akkora adatsebességgel, mint a <abbr title=\""
-"Random Access Memory\">RAM</abbr>."
+"cserehelyeszköz nem érhető el akkora adatsebességgel, mint a <abbr title="
+"\"Random Access Memory\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Az <code>/etc/hosts</code> mellőzése"
 
@@ -2615,7 +2628,7 @@ msgstr "Az <code>/etc/hosts</code> mellőzése"
 msgid "Ignore interface"
 msgstr "Csatoló mellőzése"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "A resolve fájl figyelmen kívül hagyása"
 
@@ -2667,10 +2680,6 @@ msgstr "Indítási állomány"
 msgid "Initscripts"
 msgstr "Előkészítő parancsfájlok"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Protokollkiterjesztések telepítése…"
@@ -2732,7 +2741,7 @@ msgstr "Az interfész nincs jelen, vagy még nincs csatlakoztatva."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Csatolók"
 
@@ -2793,9 +2802,9 @@ msgstr ""
 "Úgy tűnik, hogy olyan képfájlt próbál beírni, amely nem fér bele a flash-"
 "memóriába. Ellenőrizze a képfájlt!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "JavaScript szükséges!"
@@ -2816,8 +2825,8 @@ msgstr "Csatlakozás hálózathoz: %q"
 msgid "Keep settings and retain the current configuration"
 msgstr "Beállítások megtartása és a jelenlegi konfiguráció megőrzése"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Kernel napló"
 
@@ -2893,16 +2902,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Bérletfájl"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2929,11 +2939,11 @@ msgstr "Jelmagyarázat:"
 msgid "Limit"
 msgstr "Korlát"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "Figyelés korlátozása ezekre a csatolókra és a visszacsatolásra."
 
@@ -2957,7 +2967,7 @@ msgstr ""
 msgid "Link On"
 msgstr "Kapcsolat létrehozva"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2992,15 +3002,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Domain-ok listája, melyeknél az RFC1918 válaszok megengedettek"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "Gépek listája, amelyek hamis NX-tartomány eredményeket szolgáltatnak"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr "Figyelési csatolók"
 
@@ -3012,12 +3022,12 @@ msgstr "Port figyelése"
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr "Figyelés csak a megadott csatolón, vagy az összesen, ha nincs megadva"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Port figyelése a bejövő DNS-lekérdezésekhez"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Terhelés"
 
@@ -3025,10 +3035,6 @@ msgstr "Terhelés"
 msgid "Load Average"
 msgstr "Átlagos terhelés"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Betöltés"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr "Könyvtártartalmak betöltése…"
@@ -3061,7 +3067,7 @@ msgstr "Helyi IPv4 cím"
 msgid "Local IPv6 address"
 msgstr "Helyi IPv6-cím"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr "Csak helyi szolgáltatás"
 
@@ -3074,11 +3080,11 @@ msgstr "Helyi indítás"
 msgid "Local Time"
 msgstr "Helyi idő"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Helyi tartomány"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3086,17 +3092,17 @@ msgstr ""
 "Helyi tartomány meghatározása. Az ezzel a tartománnyal egyező nevek soha sem "
 "lesznek továbbítva és csak DHCP-n vagy host fájlok által kerülnek feloldásra"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 "A DHCP nevekhez és a hosts fájl bejegyzéseihez hozzáfűzött helyi "
 "tartományutótagok"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Helyi kiszolgáló"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3104,7 +3110,7 @@ msgstr ""
 "Gépnév lokalizációja a lekérdező alhálózattól függően, ha több IP cím is "
 "elérhető"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Lekérdezések behatárolása"
 
@@ -3112,7 +3118,7 @@ msgstr "Lekérdezések behatárolása"
 msgid "Log output level"
 msgstr "Napló kimeneti szintje"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Kérések naplózása"
 
@@ -3124,7 +3130,7 @@ msgstr "Naplózás"
 msgid "Login"
 msgstr "Bejelentkezés"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Kijelentkezés"
 
@@ -3223,15 +3229,15 @@ msgstr "Legnagyobb elérhető adatsebesség (ATTNDR)"
 msgid "Maximum allowed Listen Interval"
 msgstr "Legnagyobb engedélyezett figyelési időköz"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Aktív DHCP bérletek legnagyobb megengedett száma"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Párhuzamos DNS kérések maximális száma"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "EDNS.0 UDP csomagok maximális mérete"
 
@@ -3371,6 +3377,7 @@ msgstr "Csatolási pont"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Csatolási pontok"
 
@@ -3464,11 +3471,10 @@ msgstr "Név"
 msgid "Name of the new network"
 msgstr "Az új hálózat neve"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navigáció"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3476,14 +3482,15 @@ msgstr "Navigáció"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Hálózat"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Hálózati segédprogramok"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Hálózati rendszerindító lemezkép"
 
@@ -3541,13 +3548,13 @@ msgstr "Nincs elérhető információ"
 msgid "No matching prefix delegation"
 msgstr "Nincs egyező előtag-delegálás"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Nincs negatív gyorsítótár"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Nincs jelszó beállítva!"
@@ -3593,7 +3600,7 @@ msgstr "Zaj:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "Nem kezdeményező CRC-hibák (CRC_P)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3635,11 +3642,11 @@ msgstr "Nem támogatott"
 msgid "Notice"
 msgstr "Figyelmeztetés"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 "Gyorsítótárazott DNS-bejegyzések száma (legfeljebb 10000, 0 megadásakor "
@@ -3688,7 +3695,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr "Bekapcsolt állapot késleltetés"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "Legalább gépnevet vagy MAC-címet meg kell adni!"
 
@@ -3871,7 +3878,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr "A belső útvonalakhoz használt tábla felülbírálása"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Áttekintő"
 
@@ -4099,8 +4106,9 @@ msgstr "Phy sebesség:"
 msgid "Physical Settings"
 msgstr "Fizikai beállítások"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ping"
 
@@ -4178,7 +4186,7 @@ msgstr ""
 "A partner halottnak tekintése a megadott mennyiségű LCP visszhang hibák "
 "után. Használjon 0 értéket a hibák figyelmen kívül hagyásához."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4191,7 +4199,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Folyamatok"
 
@@ -4253,7 +4261,7 @@ msgstr ""
 msgid "Quality"
 msgstr "Minőség"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4322,7 +4330,7 @@ msgstr ""
 "Nyers hexadecimális kódolású bájtok. Hagyja üresen, hacsak az internet-"
 "szolgáltatója nem követelni meg"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4334,7 +4342,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "Valóban protokollt cserél?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Valós idejű grafikonok"
 
@@ -4342,12 +4350,13 @@ msgstr "Valós idejű grafikonok"
 msgid "Reassociation Deadline"
 msgstr "Újratársítás határideje"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "Újrakötési védelem"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Újraindítás"
 
@@ -4479,7 +4488,7 @@ msgstr ""
 "A wpad/hostapd „teljes” verzióját igényli és támogatást a Wi-Fi "
 "illesztőprogramtól<br />(2019. januárjától: ath9k, ath10k, mwlwifi és mt76)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4527,11 +4536,11 @@ msgstr "Számlálók nullázása"
 msgid "Reset to defaults"
 msgstr "Alapértelmezések visszaállítása"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Resolv és hosts fájlok"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Resolv fájl"
 
@@ -4583,7 +4592,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr "Beállítás visszaállítása…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "TFTP-n keresztül kiszolgált fájlok gyökérkönyvtára"
 
@@ -4609,12 +4618,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Útválasztó jelszava"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Útvonalak"
 
@@ -4652,6 +4662,7 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH hozzáférés"
 
@@ -4669,6 +4680,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH kulcsok"
 
@@ -4713,6 +4725,7 @@ msgstr "Felderítés"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Ütemezett feladatok"
 
@@ -4754,7 +4767,7 @@ msgstr ""
 "LCP visszhang kérések küldése a másodpercben megadott időközönként, csak "
 "hibaküszöbszinttel együtt van hatása"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Kiszolgáló beállításai"
 
@@ -4767,7 +4780,7 @@ msgstr "Szolgáltatás neve"
 msgid "Service Type"
 msgstr "Szolgáltatás típusa"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Szolgáltatások"
 
@@ -4858,7 +4871,7 @@ msgstr "Jel:"
 msgid "Size"
 msgstr "Méret"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr "A DNS lekérdezési gyorsítótár mérete"
 
@@ -4871,11 +4884,11 @@ msgstr ""
 msgid "Skip"
 msgstr "Kihagyás"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Ugrás a tartalomhoz"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Ugrás a navigációhoz"
 
@@ -4991,6 +5004,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Rendszerindítás"
 
@@ -5002,11 +5016,11 @@ msgstr "Statikus IPv4 útvonalak"
 msgid "Static IPv6 Routes"
 msgstr "Statikus IPv6 útvonalak"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Statikus bérletek"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Statikus útvonalak"
 
@@ -5016,7 +5030,7 @@ msgstr "Statikus útvonalak"
 msgid "Static address"
 msgstr "Statikus cím"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -5031,10 +5045,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr "Állomás tétlenségi korlátja"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Állapot"
 
@@ -5044,7 +5058,7 @@ msgstr "Állapot"
 msgid "Stop"
 msgstr "Leállítás"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Szigorú sorrend"
 
@@ -5057,11 +5071,11 @@ msgstr ""
 msgid "Submit"
 msgstr "Elküldés"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr "Naplózás elnyomása"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Ezen protokollok rutinműveletei naplózásának elnyomása"
 
@@ -5070,7 +5084,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Kapcsoló"
 
@@ -5120,15 +5134,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr "Szinkronizálás a böngészővel"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Rendszer"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Rendszernapló"
 
@@ -5144,11 +5159,11 @@ msgstr "Rendszer napló puffer méret"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "TFTP beállítások"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "TFTP-kiszolgáló gyökere"
 
@@ -5210,8 +5225,8 @@ msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
 msgstr ""
-"Az engedélyezett karakterek: <code>A-Z</code>, <code>a-z</code>, "
-"<code>0-9</code> és <code>_</code>"
+"Az engedélyezett karakterek: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> és <code>_</code>"
 
 #: modules/luci-compat/luasrc/view/cbi/error.htm:6
 msgid "The configuration file could not be loaded due to the following error:"
@@ -5320,8 +5335,8 @@ msgid ""
 "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 ""
-"Az eszközön található hálózati portok kombinálhatók több <abbr title=\""
-"Virtual Local Area Network\">VLAN</abbr>-ba, amelyekben a számítógépek "
+"Az eszközön található hálózati portok kombinálhatók több <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>-ba, amelyekben a számítógépek "
 "közvetlenül kommunikálhatnak egymással. A <abbr title=\"Virtual Local Area "
 "Network\">VLAN</abbr>-okat gyakran a hálózati szegmensek elkülönítésére "
 "használják. Gyakran alapértelmezetten van egy kimenő port a következő "
@@ -5404,7 +5419,8 @@ msgstr ""
 "A feltöltött image fájl formátuma nem támogatott. Ügyeljen arra, hogy a "
 "platformjának megfelelő általános image formátumot válassza ki."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5414,9 +5430,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr "Nincsenek alkalmazandó változtatások"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5437,7 +5453,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr "Ez nem tűnik érvényes PEM fájlnak"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5470,8 +5486,8 @@ msgid ""
 "This is the content of /etc/rc.local. Insert your own commands here (in "
 "front of 'exit 0') to execute them at the end of the boot process."
 msgstr ""
-"Ez az /etc/rc.local fájl tartalma. Szúrja be ide a saját parancsait (az „"
-"exit 0” sor elé) a rendszerindítási folyamat végén történő végrehajtásukhoz."
+"Ez az /etc/rc.local fájl tartalma. Szúrja be ide a saját parancsait (az "
+"„exit 0” sor elé) a rendszerindítási folyamat végén történő végrehajtásukhoz."
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
@@ -5481,7 +5497,7 @@ msgstr ""
 "Ez az alagút közvetítő (tunnel broker) által megadott helyi végpont címe, "
 "általában így végződik: <code>...:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5562,14 +5578,15 @@ msgstr "Tónus"
 msgid "Total Available"
 msgstr "Összes elérhető"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Traceroute"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Forgalom"
 
@@ -5800,7 +5817,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Működési idő"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "<code>/etc/ethers</code> használata"
 
@@ -5911,7 +5928,7 @@ msgstr "Átjáró metrikájának használata"
 msgid "Use routing table"
 msgstr "Útválasztó tábla használata"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5966,7 +5983,7 @@ msgstr "VDSL"
 msgid "VLANs on %q"
 msgstr "VLAN-ok %q-n"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -6046,10 +6063,6 @@ msgstr ""
 "WPA titkosításhoz kliens módnál 'wpa_supplicant', hozzáférési pont illetve "
 "ad-hoc módnál 'hostapd' telepítése szükséges."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "Várakozás a parancs befejeződésére…"
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -6089,9 +6102,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Vezeték nélküli"
 
@@ -6139,7 +6152,7 @@ msgstr "Vezeték nélküli hálózat letiltva"
 msgid "Wireless network is enabled"
 msgstr "Vezetéknélküli hálózat engedélyezve"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Fogadott DNS-kérések írása a rendszernaplóba"
 
@@ -6171,9 +6184,9 @@ msgstr ""
 "><strong>Figyelem: alapvető indítási állomány pl. \"network\" letiltása "
 "esetén, az eszköz elérhetetlenné válhat!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6197,7 +6210,7 @@ msgstr "ZRam beállítások"
 msgid "ZRam Size"
 msgstr "ZRam mérete"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "bármely"
 
@@ -6286,19 +6299,20 @@ msgstr ""
 msgid "driver default"
 msgstr "illesztőprogram alapértelmezettje"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "lejárt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
 msgstr ""
-"a fájl, ahol a megadott <abbr title=\"Dynamic Host Configuration Protocol\""
-">DHCP</abbr> bérletek tárolásra kerülnek"
+"a fájl, ahol a megadott <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr> bérletek tárolásra kerülnek"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:85
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:194
@@ -6346,7 +6360,7 @@ msgstr "8 és 63 karakter közötti kulcs"
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "helyi <abbr title=\"Domain Name System\">DNS</abbr>-fájl"
 
@@ -6383,16 +6397,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "ki"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "be"
@@ -6470,8 +6484,9 @@ msgstr "egyedi érték"
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6499,6 +6514,7 @@ msgid "untagged"
 msgstr "cimkézetlen"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr "érvényes IP-cím"
 
@@ -6511,6 +6527,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr "érvényes IPv4-cím"
 
@@ -6539,6 +6556,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr "érvényes IPv6-cím"
 
@@ -6598,6 +6616,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr "érvényes gépnév"
 
@@ -6623,6 +6644,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6670,6 +6692,15 @@ msgstr "igen"
 msgid "« Back"
 msgstr "« Vissza"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Hibás címet adott meg!"
+
+#~ msgid "Loading"
+#~ msgstr "Betöltés"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "Várakozás a parancs befejeződésére…"
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Interfészek összekapcsolása..."
 
diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po
index 40726220f..2cf99d174 100644
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -43,6 +43,8 @@ msgstr "(%d finestra in minuti , %d secondi intervallo)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -150,15 +152,15 @@ msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 "<abbr title=\"Servizio basilare di impostazione Identificatore\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "Richiesta porta <abbr title=\"Sistema Nome Dominio\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "Porta Server <abbr title=\"Sistema Nome Dominio\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -171,7 +173,7 @@ msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "<abbr title=\"Impostazione Identificatore Servizio Esteso\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Indirizzo <abbr title=\"Protocollo Internet Versione 4\">IPv4</abbr>"
@@ -199,12 +201,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Gateway <abbr title=\"Protocollo Internet Versione 6\">IPv6</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configurazione <abbr title=\"Diodo ad Emissione di Luce\">LED</abbr>"
 
@@ -212,16 +215,16 @@ msgstr "Configurazione <abbr title=\"Diodo ad Emissione di Luce\">LED</abbr>"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Diodo ad Emissione di Luce\">LED</abbr> Nome"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Indirizzo <abbr title=\"Controllo Accesso Supporto\">MAC</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -229,7 +232,7 @@ msgstr ""
 "<abbr title=\"maximal\">Max.</abbr> Contratto <abbr title=\"Configurazione "
 "Protocollo Host Dinamico\">DHCP</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -237,7 +240,7 @@ msgstr ""
 "<abbr title=\"maximal\">Max.</abbr> dimensione pacchetti <abbr title="
 "\"Estensione Meccanismi per il Sistema dei Nomi dei Domini\">EDNS0</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Max.</abbr> Richiesta in uso"
 
@@ -362,6 +365,7 @@ msgstr "Connessioni attive"
 msgid "Active DHCP Leases"
 msgstr "Contratti attivi DHCP"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Contratti attivi DHCPv6"
@@ -417,7 +421,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "Aggiungere il suffisso di dominio locale ai nomi serviti dal file hosts"
@@ -431,11 +435,11 @@ msgstr "Aggiungi nuova interfaccia..."
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "File Hosts Aggiuntivo"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -456,12 +460,13 @@ msgstr "Indirizzo"
 msgid "Address to access local relay bridge"
 msgstr "Indirizzo per accedere al ponte locale di trasmissione"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -490,17 +495,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -526,7 +531,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr "Consenti solo quelli nell'elenco"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Permetti localhost"
 
@@ -543,7 +548,7 @@ msgstr "Permetti l'accesso a root con password"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Abilita l'utente root con l'accesso via password"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -716,7 +721,7 @@ msgstr "Autenticazione PEAP"
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Autoritativo"
 
@@ -724,11 +729,11 @@ msgstr "Autoritativo"
 msgid "Authorization Required"
 msgstr "Autorizzazione richiesta"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -822,6 +827,7 @@ msgid "Backup"
 msgstr "Copia di Sicurezza"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Copia di Sicurezza / Flash Firmware"
 
@@ -830,10 +836,6 @@ msgstr "Copia di Sicurezza / Flash Firmware"
 msgid "Backup file list"
 msgstr "Elenco dei file di cui effettuare una copia di sicurezza"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "E' stato specificato un indirizzo errato!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -854,7 +856,7 @@ msgstr ""
 "composta dai file di configurazione modificati installati da opkg, file di "
 "base essenziali e i file di backup definiti dall'utente."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -874,7 +876,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Ignora Dominio Bogus NX"
 
@@ -1070,10 +1072,11 @@ msgid "Close list..."
 msgstr "Scegliere dall'elenco..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Raccolgo i dati..."
 
@@ -1102,7 +1105,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Configurazione"
@@ -1142,7 +1144,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Connessioni"
 
@@ -1237,8 +1239,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr "Server DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP e DNS"
 
@@ -1273,7 +1275,7 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "Inoltri DNS"
 
@@ -1281,11 +1283,11 @@ msgstr "Inoltri DNS"
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1314,6 +1316,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1455,8 +1458,7 @@ msgstr "Dispositivo irraggiungibile"
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Diagnostica"
 
@@ -1515,7 +1517,7 @@ msgstr "Disabilitato"
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Ignora risposte RFC1918 upstream"
 
@@ -1549,7 +1551,7 @@ msgstr "Ottimizzazione distanza"
 msgid "Distance to farthest network member in meters."
 msgstr "Distanza del membro più lontano della rete in metri."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1560,17 +1562,17 @@ msgstr ""
 "\">DHCP</abbr> e inoltratore <abbr title=\"Domain Name System\">DNS</abbr> "
 "per firewall <abbr title=\"Network Address Translation\">NAT</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr "Non memorizzare le repliche negative, es. per domini non esistenti"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Non inoltrare le richieste che non possono essere risolte dai name server "
 "pubblici"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Non proseguire con le ricerche inverse per le reti locali."
 
@@ -1590,11 +1592,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Dominio richiesto"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Elenco Domini consentiti"
 
@@ -1602,7 +1604,7 @@ msgstr "Elenco Domini consentiti"
 msgid "Don't Fragment"
 msgstr "Non Frammentare"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1750,7 +1752,7 @@ msgstr "Attiva il cliente NTP"
 msgid "Enable Single DES"
 msgstr "Abilita Single DES"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Abilita il server TFTP"
 
@@ -1870,11 +1872,11 @@ msgstr "Scheda di Rete"
 msgid "Ethernet Switch"
 msgstr "Switch di Rete"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Espandi gli hosts"
 
@@ -1883,6 +1885,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1961,7 +1970,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "Nome del file dell'immagine di avvio annunciato ai clienti."
 
@@ -1970,11 +1979,11 @@ msgstr "Nome del file dell'immagine di avvio annunciato ai clienti."
 msgid "Filesystem"
 msgstr "Filesystem"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Filtra privati"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Filtra inutili"
 
@@ -1997,7 +2006,7 @@ msgstr "Trova e aggiungi una rete"
 msgid "Finish"
 msgstr "Fine"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -2021,7 +2030,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Versione del Firmware"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Porta di origine fissa per le richieste DNS in uscita"
 
@@ -2149,7 +2158,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2190,9 +2199,9 @@ msgstr "Impostazioni Globali"
 msgid "Global network options"
 msgstr "Opzioni rete globale"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Vai alla configurazione della password..."
@@ -2245,6 +2254,7 @@ msgstr "Nascondi <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2269,7 +2279,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2282,7 +2292,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "Nome host da inviare al momento della richiesta DHCP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Hostname"
 
@@ -2320,13 +2330,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2394,6 +2404,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2404,8 +2416,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2475,6 +2485,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr "Suffisso IPv6"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2577,7 +2588,7 @@ msgstr ""
 "dispositivo di swap non può essere acceduto alle alte velocità della <abbr "
 "title=\"Random Access Memory\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignora <code>/etc/hosts</code>"
 
@@ -2585,7 +2596,7 @@ msgstr "Ignora <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Ignora interfaccia"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Ignora file resolv"
 
@@ -2637,10 +2648,6 @@ msgstr "Script di avvio"
 msgid "Initscripts"
 msgstr "Scripts di avvio"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Installa le estensioni del protocollo..."
@@ -2702,7 +2709,7 @@ msgstr "Interfaccia non presente o non ancora connessa."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Interfacce"
 
@@ -2760,9 +2767,9 @@ msgstr ""
 "Sembra tu stia provando a flashare un'immagine più grande delle dimensioni "
 "della memoria flash, per favore controlla il file!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "Richiesto JavaScript!"
@@ -2783,8 +2790,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Registro del Kernel"
 
@@ -2860,16 +2867,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "Tempo Contratto"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "File di contratti"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2896,11 +2904,11 @@ msgstr "Legenda:"
 msgid "Limit"
 msgstr "Limite"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2924,7 +2932,7 @@ msgstr ""
 msgid "Link On"
 msgstr "Collegamento on"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2954,15 +2962,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Elenco di domini da consentire le risposte RFC1918 per"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "Elenco degli host che forniscono falsi risultati di dominio NX"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2974,12 +2982,12 @@ msgstr ""
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr "Ascolta solo l'interfaccia data o, se non specificato, su tutte"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Porta di ascolto per le richieste DNS in entrata"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Carico"
 
@@ -2987,10 +2995,6 @@ msgstr "Carico"
 msgid "Load Average"
 msgstr "Carico Medio"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Caricamento"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -3023,7 +3027,7 @@ msgstr "Indirizzo IPv4 locale"
 msgid "Local IPv6 address"
 msgstr "Indirizzo IPv6 locale"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -3036,11 +3040,11 @@ msgstr "Avvio Locale"
 msgid "Local Time"
 msgstr "Ora locale"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Dominio Locale"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 #, fuzzy
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
@@ -3049,16 +3053,16 @@ msgstr ""
 "Specifiche dominio locale. I nomi di dominio corrispondenti a questi criteri "
 "non sono mai inoltrate e risolti solo da DHCP o file hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 "Suffisso di dominio locale aggiunto ai nomi dei DHCP e voci del file hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Server Locale"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3066,7 +3070,7 @@ msgstr ""
 "Localizzare nome host a seconda della sottorete richiedente se sono "
 "disponibili IP multipli"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Localizza richieste"
 
@@ -3074,7 +3078,7 @@ msgstr "Localizza richieste"
 msgid "Log output level"
 msgstr "Livello di dettaglio registro"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Logga richieste"
 
@@ -3086,7 +3090,7 @@ msgstr "Logging"
 msgid "Login"
 msgstr "Login"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Slogga"
 
@@ -3183,15 +3187,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
@@ -3331,6 +3335,7 @@ msgstr "Punto di Mount"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Punti di Mount"
 
@@ -3424,11 +3429,10 @@ msgstr "Nome"
 msgid "Name of the new network"
 msgstr "Nome della nuova rete"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navigazione"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3436,14 +3440,15 @@ msgstr "Navigazione"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Rete"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Utilità di Rete"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr ""
 
@@ -3501,13 +3506,13 @@ msgstr "Nessuna informazione disponibile"
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Nessuna password immessa!"
@@ -3553,7 +3558,7 @@ msgstr "Rumore:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3595,11 +3600,11 @@ msgstr ""
 msgid "Notice"
 msgstr "Notifica"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3646,7 +3651,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
@@ -3823,7 +3828,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr "Sovrascrivi la tabella usata per le route interne"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Riassunto"
 
@@ -4051,8 +4056,9 @@ msgstr ""
 msgid "Physical Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4128,7 +4134,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4141,7 +4147,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Processi"
 
@@ -4198,7 +4204,7 @@ msgstr ""
 msgid "Quality"
 msgstr "Qualità"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4265,7 +4271,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4277,7 +4283,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "Cambiare veramente il protocollo?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Grafici in Tempo Reale"
 
@@ -4285,12 +4291,13 @@ msgstr "Grafici in Tempo Reale"
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Riavvia"
 
@@ -4418,7 +4425,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4464,11 +4471,11 @@ msgstr "Azzera Contatori"
 msgid "Reset to defaults"
 msgstr "Azzera a default"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "File Resolve"
 
@@ -4520,7 +4527,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4546,12 +4553,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Route"
 
@@ -4589,6 +4597,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4606,6 +4615,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4650,6 +4660,7 @@ msgstr "Scan"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Operazioni programmate"
 
@@ -4689,7 +4700,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Impostazioni Server"
 
@@ -4702,7 +4713,7 @@ msgstr ""
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Servizi"
 
@@ -4793,7 +4804,7 @@ msgstr ""
 msgid "Size"
 msgstr "Dimensione"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4806,11 +4817,11 @@ msgstr ""
 msgid "Skip"
 msgstr "Salta"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Salta a contenuto"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Salta a navigazione"
 
@@ -4919,6 +4930,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Avvio"
 
@@ -4930,11 +4942,11 @@ msgstr "Instradamento statico IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Instradamento statico IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Contratti statici"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Instradamenti Statici"
 
@@ -4944,7 +4956,7 @@ msgstr "Instradamenti Statici"
 msgid "Static address"
 msgstr "Indirizzo Statico"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4959,10 +4971,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Stato"
 
@@ -4972,7 +4984,7 @@ msgstr "Stato"
 msgid "Stop"
 msgstr "Arresta"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Ordine severo"
 
@@ -4985,11 +4997,11 @@ msgstr ""
 msgid "Submit"
 msgstr "Invia"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4998,7 +5010,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Switch"
 
@@ -5046,15 +5058,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr "Sincronizza con il browser"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistema"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Registro di Sistema"
 
@@ -5070,11 +5083,11 @@ msgstr "Dimensione Buffer Log di Sistema"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Impostazioni TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "Server TFTP principale"
 
@@ -5303,7 +5316,8 @@ msgstr ""
 "The uploaded image file does not contain a supported format. Make sure that "
 "you choose the generic image format for your platform."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5313,9 +5327,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5334,7 +5348,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5367,7 +5381,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5444,14 +5458,15 @@ msgstr ""
 msgid "Total Available"
 msgstr "Totale"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Traffico"
 
@@ -5679,7 +5694,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Tempo di attività"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Usa <code>/etc/ethers</code>"
 
@@ -5790,7 +5805,7 @@ msgstr "Usa la metrica del gateway"
 msgid "Use routing table"
 msgstr "Utilizzare tabella di instradamento"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5845,7 +5860,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr "VLANs su %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5925,10 +5940,6 @@ msgstr ""
 "La crittografia WPA richiede wpa_supplicant (per la modalità client) o "
 "hostapd (per AP e modalità ad hoc) per essere installato."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "In attesa del comando da completare..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5963,9 +5974,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Wireless"
 
@@ -6013,7 +6024,7 @@ msgstr "La rete Wireless è disattivata"
 msgid "Wireless network is enabled"
 msgstr "La rete wireless è attivata"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Scrittura delle richiesta DNS ricevute nel syslog"
 
@@ -6044,9 +6055,9 @@ msgstr ""
 "inizializzazione essenziali come ad esempio la \"rete\", il dispositivo "
 "potrebbe diventare inaccessibile!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6070,7 +6081,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "qualsiasi"
 
@@ -6159,13 +6170,14 @@ msgstr "disabilitato"
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "scaduto"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6219,7 +6231,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "File <abbr title=\"Sistema Nome Dominio\">DNS</abbr> locale"
 
@@ -6256,16 +6268,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "spento"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "acceso"
@@ -6343,8 +6355,9 @@ msgstr ""
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6372,6 +6385,7 @@ msgid "untagged"
 msgstr "non etichettato"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6384,6 +6398,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6412,6 +6427,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6471,6 +6487,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6496,6 +6515,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6543,6 +6563,15 @@ msgstr "Sì"
 msgid "« Back"
 msgstr "« Indietro"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "E' stato specificato un indirizzo errato!"
+
+#~ msgid "Loading"
+#~ msgstr "Caricamento"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "In attesa del comando da completare..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Assegna Interfacce..."
 
diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index 4a0d21eef..d90f6cc59 100644
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -43,6 +43,8 @@ msgstr "(%d 分幅, %d 秒間隔)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -149,15 +151,15 @@ msgstr "802.11w 再試行タイムアウト"
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> クエリポート"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> サーバーポート"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -169,7 +171,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-アドレス"
@@ -196,13 +198,14 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-ゲートウェイ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-サフィックス (16進数)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 設定"
 
@@ -210,16 +213,16 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 設定"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 名"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-アドレス"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -227,7 +230,7 @@ msgstr ""
 "<abbr title=\"maximal\">最大</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> リース"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -235,7 +238,7 @@ msgstr ""
 "<abbr title=\"maximal\">最大</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> パケットサイズ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">最大</abbr> 並列処理クエリ"
 
@@ -355,6 +358,7 @@ msgstr "アクティブ コネクション"
 msgid "Active DHCP Leases"
 msgstr "アクティブなDHCPリース"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "アクティブなDHCPv6リース"
@@ -410,7 +414,7 @@ msgstr "インスタンスを追加"
 msgid "Add key"
 msgstr "公開鍵を追加"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "hosts ファイルにより解決される名前にローカルドメイン サフィックスを付加しま"
@@ -425,11 +429,11 @@ msgstr "インターフェースの新規作成..."
 msgid "Add peer"
 msgstr "ピアを追加"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "追加のホストファイル"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "追加のサーバー ファイル"
 
@@ -450,12 +454,13 @@ msgstr "アドレス"
 msgid "Address to access local relay bridge"
 msgstr "ローカル リレーブリッジにアクセスするためのIPアドレス"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "管理画面"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -484,18 +489,18 @@ msgstr "エイリアス インターフェース"
 msgid "Alias of \"%s\""
 msgstr "\"%s\" のエイリアス"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr "全てのサーバー"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 "IP アドレスを連続的に並べ、利用可能な最小のアドレスから払い出しを開始します。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr "連続 IP"
 
@@ -519,7 +524,7 @@ msgstr "レガシー 802.11b レートを許可"
 msgid "Allow listed only"
 msgstr "リスト内の端末からのアクセスを許可"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "ローカルホストを許可する"
 
@@ -536,7 +541,7 @@ msgstr "パスワードでの root ログインを許可"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "パスワードを使用した <em>root</em> 権限でのログインを許可します。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -718,7 +723,7 @@ msgstr "認証"
 msgid "Authentication Type"
 msgstr "認証タイプ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Authoritative"
 
@@ -726,11 +731,11 @@ msgstr "Authoritative"
 msgid "Authorization Required"
 msgstr "ログイン認証"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -824,6 +829,7 @@ msgid "Backup"
 msgstr "バックアップ"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "バックアップ / ファームウェア更新"
 
@@ -832,10 +838,6 @@ msgstr "バックアップ / ファームウェア更新"
 msgid "Backup file list"
 msgstr "バックアップファイル リスト"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "無効なアドレスです!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -856,7 +858,7 @@ msgstr ""
 "よって認識されている設定ファイル、重要なベースファイル、ユーザーが設定したパ"
 "ターンに一致したファイルの一覧です。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -878,7 +880,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr "ビットレート"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "偽の NX ドメイン オーバーライド"
 
@@ -1077,10 +1079,11 @@ msgid "Close list..."
 msgstr "リストを閉じる"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "データ収集中です..."
 
@@ -1113,7 +1116,6 @@ msgstr ""
 "ネゴシエーションの信頼性低下の原因となることがあります。"
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "設定"
@@ -1153,7 +1155,7 @@ msgstr "接続の試行が失敗しました"
 msgid "Connection lost"
 msgstr "接続喪失"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "ネットワーク接続"
 
@@ -1253,8 +1255,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr "DHCPサーバー"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP 及び DNS"
 
@@ -1289,7 +1291,7 @@ msgstr "DHCPv6-サービス"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "DNSフォワーディング"
 
@@ -1297,11 +1299,11 @@ msgstr "DNSフォワーディング"
 msgid "DNS-Label / FQDN"
 msgstr "DNS-ラベル / FQDN"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr "DNSSEC 未署名チェック"
 
@@ -1330,6 +1332,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr "DTIM インターバル"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1470,8 +1473,7 @@ msgstr "デバイスに到達できません"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "デバイスに到達できません！まだデバイスを待っています..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "診断機能"
 
@@ -1530,7 +1532,7 @@ msgstr "無効"
 msgid "Disassociate On Low Acknowledgement"
 msgstr "低 Acknowledgement 時のアソシエーション解除"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "RFC1918の応答を破棄します"
 
@@ -1564,7 +1566,7 @@ msgstr "距離の最適化"
 msgid "Distance to farthest network member in meters."
 msgstr "最も遠い端末との距離（メートル）を設定してください。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1576,16 +1578,16 @@ msgstr ""
 "ウォールの為の <abbr title=\"Domain Name System\">DNS</abbr>フォワーダーを複"
 "合したサービスです。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 "無効なリプライをキャッシュしません（例：存在しないドメインからの返答など）"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr "パブリック DNSサーバーが返答できなかったリクエストを転送しません"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "ローカル ネットワークへの逆引きを転送しません"
 
@@ -1605,11 +1607,11 @@ msgstr "本当に全ての設定を消去しますか？"
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr "本当にディレクトリ \"%s\" を再帰的に削除しますか？"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "ドメイン必須"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "ドメイン ホワイトリスト"
 
@@ -1617,7 +1619,7 @@ msgstr "ドメイン ホワイトリスト"
 msgid "Don't Fragment"
 msgstr "非フラグメント化"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1769,7 +1771,7 @@ msgstr "NTPクライアント機能を有効にする"
 msgid "Enable Single DES"
 msgstr "シングルDESの有効化"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "TFTPサーバーを有効にする"
 
@@ -1891,11 +1893,11 @@ msgstr "イーサネットアダプタ"
 msgid "Ethernet Switch"
 msgstr "イーサネットスイッチ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr "除外インターフェース"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "拡張ホスト設定"
 
@@ -1904,6 +1906,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr "期待される値: 16進数の割り当てヒント"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr "期待される値: %s"
 
@@ -1982,7 +1991,7 @@ msgstr ""
 msgid "Filename"
 msgstr "ファイル名"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "クライアントに通知するブートイメージのファイル名"
 
@@ -1991,11 +2000,11 @@ msgstr "クライアントに通知するブートイメージのファイル名
 msgid "Filesystem"
 msgstr "ファイルシステム"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "プライベートフィルター"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr ""
 
@@ -2020,7 +2029,7 @@ msgstr "ネットワークの検索と参加"
 msgid "Finish"
 msgstr "終了"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "ファイアウォール"
 
@@ -2044,7 +2053,7 @@ msgstr "ファームウェア ファイル"
 msgid "Firmware Version"
 msgstr "ファームウェア バージョン"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "DNSクエリを送信する送信元ポートを固定します"
 
@@ -2175,7 +2184,7 @@ msgstr "無効なゲートウェイ アドレスです"
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2214,9 +2223,9 @@ msgstr "全体設定"
 msgid "Global network options"
 msgstr "グローバル ネットワークオプション"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "パスワード設定へ移動..."
@@ -2268,6 +2277,7 @@ msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>の隠匿"
 msgid "Hide empty chains"
 msgstr "空のチェインを非表示"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2292,7 +2302,7 @@ msgid "Host-Uniq tag content"
 msgstr "Host-Uniq タグ"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2305,7 +2315,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "DHCPリクエスト時に送信するホスト名"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "ホスト名"
 
@@ -2343,13 +2353,13 @@ msgstr "無効な IP アドレスです"
 msgid "IP address is missing"
 msgstr "IP アドレスがありません"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2417,6 +2427,8 @@ msgstr "IPv4-in-IPv4 (RFC2003)"
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2427,8 +2439,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2498,6 +2508,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr "IPv6 サフィックス"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2597,7 +2608,7 @@ msgstr ""
 "Memory\">RAM</abbr>から高速にアクセスすることができないため、データのスワップ"
 "は非常に遅い処理であることに注意します。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "<code>/etc/hosts</code>を無視"
 
@@ -2605,7 +2616,7 @@ msgstr "<code>/etc/hosts</code>を無視"
 msgid "Ignore interface"
 msgstr "インターフェースを無視する"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "リゾルバ ファイルを無視する"
 
@@ -2659,12 +2670,6 @@ msgstr "起動スクリプト"
 msgid "Initscripts"
 msgstr "起動スクリプト"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-"IPv6 の traceroute を使用するには、 iputils-traceroute6 をインストールしま"
-"す。"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "プロトコル拡張機能をインストールします..."
@@ -2727,7 +2732,7 @@ msgstr "インターフェースが存在しないか、接続していません
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "インターフェース"
 
@@ -2785,9 +2790,9 @@ msgstr ""
 "更新しようとしたイメージファイルはこのフラッシュメモリに適合しません。イメー"
 "ジファイルを確認してください!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "JavaScriptを有効にしてください!"
@@ -2808,8 +2813,8 @@ msgstr "ネットワークに接続: %q"
 msgid "Keep settings and retain the current configuration"
 msgstr "現在の設定を保持"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "カーネル ログ"
 
@@ -2885,16 +2890,17 @@ msgstr "レイテンシー"
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "リース時間"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "リースファイル"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2921,13 +2927,13 @@ msgstr "凡例:"
 msgid "Limit"
 msgstr "割り当て数"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 "DNS サービスを、現在 DNS を提供しているサブネットのインターフェースに限定しま"
 "す。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "待ち受けをこれらのインターフェースとループバックに制限します。"
 
@@ -2951,7 +2957,7 @@ msgstr ""
 msgid "Link On"
 msgstr "リンクオン"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2981,15 +2987,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr "認証用 SSH暗号キー ファイルのリスト"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "RFC1918の応答を許可するリスト"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "NX ドメインの偽の結果として返されるホストのリストです。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr "待ち受けインターフェース"
 
@@ -3003,12 +3009,12 @@ msgstr ""
 "指定されたインターフェースでのみ待ち受けを行います。設定しない場合はすべての"
 "インタフェースが対象です。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "DNSクエリを受信するポート"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "負荷"
 
@@ -3016,10 +3022,6 @@ msgstr "負荷"
 msgid "Load Average"
 msgstr "システム平均負荷"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "ロード中"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr "ディレクトリ内を読み込み中..."
@@ -3052,7 +3054,7 @@ msgstr "ローカル IPv4 アドレス"
 msgid "Local IPv6 address"
 msgstr "ローカル IPv6 アドレス"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr "ローカルサービスのみ"
 
@@ -3065,11 +3067,11 @@ msgstr "ローカル スタートアップ"
 msgid "Local Time"
 msgstr "時刻"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "ローカル ドメイン"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3077,17 +3079,17 @@ msgstr ""
 "ローカル ドメインの定義です。このドメインに一致する名前は転送が行われず、 "
 "DHCP または hosts ファイルのみにより解決されます。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 "DHCP名とhostsファイルのエントリーに付される、ローカルドメイン サフィックスで"
 "す。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "ローカル サーバー"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3095,7 +3097,7 @@ msgstr ""
 "複数の IP が利用可能な場合に、ホスト名をリクエスト中のサブネットによってロー"
 "カライズします"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "ローカライズクエリ"
 
@@ -3103,7 +3105,7 @@ msgstr "ローカライズクエリ"
 msgid "Log output level"
 msgstr "ログ出力レベル"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "ログ クエリ"
 
@@ -3115,7 +3117,7 @@ msgstr "ログ"
 msgid "Login"
 msgstr "ログイン"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "ログアウト"
 
@@ -3214,15 +3216,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr "許容される最大 Listen 間隔"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "DHCPリースの許可される最大数"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "並列DNSクエリの許可される最大数"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "EDNS.0 UDP パケットサイズの許可される最大数"
 
@@ -3362,6 +3364,7 @@ msgstr "マウントポイント"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "マウントポイント"
 
@@ -3455,11 +3458,10 @@ msgstr "名前"
 msgid "Name of the new network"
 msgstr "新しいネットワークの名前"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3467,14 +3469,15 @@ msgstr "ナビゲーション"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "ネットワーク"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "ネットワーク ユーティリティ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "ネットワークブート用イメージ"
 
@@ -3532,13 +3535,13 @@ msgstr "情報がありません"
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "ネガティブキャッシュを行なわない"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "パスワードが設定されていません!"
@@ -3584,7 +3587,7 @@ msgstr "ノイズ:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr "非ワイルドカード"
 
@@ -3626,11 +3629,11 @@ msgstr "サポートされていません"
 msgid "Notice"
 msgstr "注意"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 "キャッシュされる DNS エントリーの数です。（最大 10000 件。 0の場合はキャッ"
@@ -3679,7 +3682,7 @@ msgstr "On-Link ルート"
 msgid "On-State Delay"
 msgstr "点灯時間"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "1つ以上のホスト名またはMACアドレスを設定してください!"
 
@@ -3864,7 +3867,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr "内部ルートに使用されるテーブルを上書きします。"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "概要"
 
@@ -4092,8 +4095,9 @@ msgstr "物理レート:"
 msgid "Physical Settings"
 msgstr "デバイス設定"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ping"
 
@@ -4171,7 +4175,7 @@ msgstr ""
 "設定回数のLCP echo 確認失敗後、ピアノードがダウンしているものと見なします。0"
 "を設定した場合、失敗しても無視します"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr "これらのインターフェースでの待ち受けを停止します。"
 
@@ -4184,7 +4188,7 @@ msgid "Private Key"
 msgstr "秘密鍵"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "プロセス"
 
@@ -4245,7 +4249,7 @@ msgstr ""
 msgid "Quality"
 msgstr "クオリティ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4316,7 +4320,7 @@ msgstr ""
 "16 進数でエンコードされた、生のバイト値です。 ISP がこれを必須としない場合、"
 "空欄のままにします。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4328,7 +4332,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "本当にプロトコルを切り替えますか?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "リアルタイム グラフ"
 
@@ -4336,12 +4340,13 @@ msgstr "リアルタイム グラフ"
 msgid "Reassociation Deadline"
 msgstr "再アソシエーション制限時間"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "DNSリバインディング・プロテクション"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "再起動"
 
@@ -4471,7 +4476,7 @@ msgstr ""
 "'フル' バージョンの wpad/hostapd と、無線LANドライバーによるサポートが必要で"
 "す。<br />（2019年1月現在: ath9k、ath10k、mwlwifi 及び mt76）"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4519,11 +4524,11 @@ msgstr "カウンタをリセット"
 msgid "Reset to defaults"
 msgstr "標準設定にリセット"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "名前解決およびホストファイル設定"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "リゾルバファイル"
 
@@ -4575,7 +4580,7 @@ msgstr "取り消しのリクエストはステータス <code>%h</code> で失�
 msgid "Reverting configuration…"
 msgstr "設定を元に戻しています..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "TFTP経由でファイルを取り扱う際のルートディレクトリ"
 
@@ -4601,12 +4606,13 @@ msgstr "ルーター アドバタイズメント-サービス"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "ルーター パスワード"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "経路情報"
 
@@ -4644,6 +4650,7 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH アクセス"
 
@@ -4661,6 +4668,7 @@ msgstr "SSH ユーザー名"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH キー"
 
@@ -4705,6 +4713,7 @@ msgstr "スキャン"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "スケジュールタスク"
 
@@ -4749,7 +4758,7 @@ msgstr ""
 "設定された秒間隔でLCP echoリクエストを送信します。失敗数しきい値を設定した場"
 "合のみ、機能が有効になります。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "サーバー設定"
 
@@ -4762,7 +4771,7 @@ msgstr "サービス名"
 msgid "Service Type"
 msgstr "サービスタイプ"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "サービス"
 
@@ -4854,7 +4863,7 @@ msgstr "信号:"
 msgid "Size"
 msgstr "サイズ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr "DNS クエリ キャッシュのサイズ"
 
@@ -4867,11 +4876,11 @@ msgstr "ZRam デバイスのサイズ (MB) です。"
 msgid "Skip"
 msgstr "スキップ"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "コンテンツへ移動"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "ナビゲーションへ移動"
 
@@ -4982,6 +4991,7 @@ msgstr "無線LANのスキャンを開始しています..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "スタートアップ"
 
@@ -4993,11 +5003,11 @@ msgstr "IPv4 静的ルーティング"
 msgid "Static IPv6 Routes"
 msgstr "IPv6 静的ルーティング"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "静的リース"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "静的ルーティング"
 
@@ -5007,7 +5017,7 @@ msgstr "静的ルーティング"
 msgid "Static address"
 msgstr "静的アドレス"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -5021,10 +5031,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr "非アクティブなステーションの制限"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "ステータス"
 
@@ -5034,7 +5044,7 @@ msgstr "ステータス"
 msgid "Stop"
 msgstr "停止"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "問い合わせの制限"
 
@@ -5047,11 +5057,11 @@ msgstr "強"
 msgid "Submit"
 msgstr "送信"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr "ログの抑制"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "これらのプロトコルの、ルーチン的操作についてのログを抑制します。"
 
@@ -5060,7 +5070,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "スイッチ"
 
@@ -5110,15 +5120,16 @@ msgstr "NTP サーバーと同期"
 msgid "Sync with browser"
 msgstr "ブラウザの時刻と同期"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "システム"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "システムログ"
 
@@ -5134,11 +5145,11 @@ msgstr "システムログ バッファサイズ"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "TFTP設定"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "TFTPサーバー・ルート"
 
@@ -5392,7 +5403,8 @@ msgstr ""
 "マットではありません。このプラットフォームに適合したイメージファイルかどう"
 "か、確認してください。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5402,9 +5414,9 @@ msgstr "アクティブなリースはありません"
 msgid "There are no changes to apply"
 msgstr "適用する変更はありません"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5425,7 +5437,7 @@ msgstr "この認証タイプは、選択された EAP メソッドに適用で�
 msgid "This does not look like a valid PEM file"
 msgstr "これは有効な PEM ファイルではないようです"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5468,7 +5480,7 @@ msgstr ""
 "プロバイダからアサインされた、ローカルのエンドポイント アドレスです。通常、"
 "<code>...:2/64</code>が終端に設定されます。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5545,14 +5557,15 @@ msgstr ""
 msgid "Total Available"
 msgstr "合計"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Traceroute"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "トラフィック"
 
@@ -5784,7 +5797,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "起動時間"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "<code>/etc/ethers</code> を使用する"
 
@@ -5895,7 +5908,7 @@ msgstr "ゲートウェイ メトリックを使用する"
 msgid "Use routing table"
 msgstr "ルーティング テーブルの使用"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5948,7 +5961,7 @@ msgstr "VDSL"
 msgid "VLANs on %q"
 msgstr "%q上のVLAN"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr "VPN"
 
@@ -6029,10 +6042,6 @@ msgstr ""
 "hostapd (アクセスポイント及びアドホック) がインストールされている必要がありま"
 "す。"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "コマンド実行中です..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "デバイスを起動中です..."
@@ -6070,9 +6079,9 @@ msgstr "帯域幅"
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "無線"
 
@@ -6120,7 +6129,7 @@ msgstr "無線LAN機能は無効になっています"
 msgid "Wireless network is enabled"
 msgstr "無線LAN機能は有効になっています"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "受信したDNSリクエストをsyslogへ記録します"
 
@@ -6152,9 +6161,9 @@ msgstr ""
 "ビスを無効にするとルーターにアクセスできなくなりますので、注意してください。"
 "</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6176,7 +6185,7 @@ msgstr "ZRam 設定"
 msgid "ZRam Size"
 msgstr "ZRam サイズ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "全て"
 
@@ -6265,13 +6274,14 @@ msgstr "無効"
 msgid "driver default"
 msgstr "ドライバーのデフォルト"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "期限切れ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6325,7 +6335,7 @@ msgstr "8 文字以上 63 文字以下のキー"
 msgid "key with either 5 or 13 characters"
 msgstr "5 文字または 13 文字のキー"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "ローカル <abbr title=\"Domain Name System\">DNS</abbr>ファイル"
 
@@ -6362,16 +6372,16 @@ msgstr "存在しません"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "オフ"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "オン"
@@ -6449,8 +6459,9 @@ msgstr "ユニークな値"
 msgid "unknown"
 msgstr "不明"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6478,6 +6489,7 @@ msgid "untagged"
 msgstr "untagged"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr "有効な IP アドレス"
 
@@ -6490,6 +6502,7 @@ msgid "valid IPv4 CIDR"
 msgstr "有効な IPv4 CIDR"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr "有効な IPv4 アドレス"
 
@@ -6518,6 +6531,7 @@ msgid "valid IPv6 CIDR"
 msgstr "有効な IPv6 CIDR"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr "有効な IPv6 アドレス"
 
@@ -6577,6 +6591,9 @@ msgstr "有効なホスト:ポート"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr "有効なホスト名"
 
@@ -6602,6 +6619,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr "有効なポートまたはポート範囲（port1-port2)"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr "有効なポート番号"
 
@@ -6649,6 +6667,20 @@ msgstr "はい"
 msgid "« Back"
 msgstr "« 戻る"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "無効なアドレスです!"
+
+#~ msgid "Install iputils-traceroute6 for IPv6 traceroute"
+#~ msgstr ""
+#~ "IPv6 の traceroute を使用するには、 iputils-traceroute6 をインストールしま"
+#~ "す。"
+
+#~ msgid "Loading"
+#~ msgstr "ロード中"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "コマンド実行中です..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "インターフェースの割当て..."
 
diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po
index 3f6d50a67..e980f1541 100644
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -42,6 +42,8 @@ msgstr "(%d 분 window, %d 초 간격)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -148,15 +150,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> query 포트"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> 서버 포트"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -166,7 +168,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-주소"
@@ -191,12 +193,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 설정"
 
@@ -204,16 +207,16 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 설정"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 이름"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-주소"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -221,7 +224,7 @@ msgstr ""
 "<abbr title=\"maximal\">최대</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> lease 수"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -229,7 +232,7 @@ msgstr ""
 "<abbr title=\"maximal\">최대</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> 패킷 크기"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">최대</abbr> 동시 처리 query 수"
 
@@ -347,6 +350,7 @@ msgstr "Active 연결수"
 msgid "Active DHCP Leases"
 msgstr "Active DHCP 임대 목록"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Active DHCPv6 임대 목록"
@@ -402,7 +406,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
@@ -415,11 +419,11 @@ msgstr "새로운 인터페이스 추가..."
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "추가적인 Hosts 파일들"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -440,12 +444,13 @@ msgstr "주소"
 msgid "Address to access local relay bridge"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "관리"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -474,17 +479,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -508,7 +513,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr ""
 
@@ -524,7 +529,7 @@ msgstr "암호를 이용한 root 접근 허용"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "암호를 이용한 <em>root</em> 사용자 접근을 허용합니다"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -695,7 +700,7 @@ msgstr ""
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr ""
 
@@ -703,11 +708,11 @@ msgstr ""
 msgid "Authorization Required"
 msgstr "인증이 필요합니다"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -801,6 +806,7 @@ msgid "Backup"
 msgstr "백업"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Firmware 백업 / Flash"
 
@@ -809,10 +815,6 @@ msgstr "Firmware 백업 / Flash"
 msgid "Backup file list"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr ""
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -833,7 +835,7 @@ msgstr ""
 "필수 기본 파일 그리고 사용자가 패턴 정의로 백업하도록 지정한 것로 이루어져 있"
 "습니다."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -853,7 +855,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr ""
 
@@ -1047,10 +1049,11 @@ msgid "Close list..."
 msgstr "목록 닫기..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Data 를 수집중입니다..."
 
@@ -1079,7 +1082,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "설정"
@@ -1119,7 +1121,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "연결"
 
@@ -1214,8 +1216,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr "DHCP 서버"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP 와 DNS"
 
@@ -1250,7 +1252,7 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr ""
 
@@ -1258,11 +1260,11 @@ msgstr ""
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1291,6 +1293,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1432,8 +1435,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "진단"
 
@@ -1492,7 +1494,7 @@ msgstr ""
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
@@ -1526,7 +1528,7 @@ msgstr ""
 msgid "Distance to farthest network member in meters."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1537,15 +1539,15 @@ msgstr ""
 "한 <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-서버와 "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Forwarder 기능을 제공합니다."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1565,11 +1567,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr ""
 
@@ -1577,7 +1579,7 @@ msgstr ""
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1722,7 +1724,7 @@ msgstr "NTP client 활성화"
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "TFTP 서버 활성화"
 
@@ -1842,11 +1844,11 @@ msgstr ""
 msgid "Ethernet Switch"
 msgstr "Ethernet 스위치"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr ""
 
@@ -1855,6 +1857,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1931,7 +1940,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1940,11 +1949,11 @@ msgstr ""
 msgid "Filesystem"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr ""
 
@@ -1967,7 +1976,7 @@ msgstr "네트워크 검색 및 연결합니다"
 msgid "Finish"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "방화벽"
 
@@ -1991,7 +2000,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Firmware 버전"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2119,7 +2128,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2158,9 +2167,9 @@ msgstr ""
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "암호 설정 하기"
@@ -2212,6 +2221,7 @@ msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr> 숨기기"
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2235,7 +2245,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2248,7 +2258,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "DHCP 요청시 전달할 호스트이름"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "호스트이름"
 
@@ -2286,13 +2296,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
@@ -2360,6 +2370,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2370,8 +2382,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2441,6 +2451,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2532,7 +2543,7 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "<code>/etc/hosts</code> 파일 무시"
 
@@ -2540,7 +2551,7 @@ msgstr "<code>/etc/hosts</code> 파일 무시"
 msgid "Ignore interface"
 msgstr "인터페이스 무시"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "resolve 파일 무시"
 
@@ -2592,10 +2603,6 @@ msgstr ""
 msgid "Initscripts"
 msgstr "Initscript 들"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr ""
@@ -2657,7 +2664,7 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "인터페이스"
 
@@ -2712,9 +2719,9 @@ msgid ""
 "flash memory, please verify the image file!"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr ""
@@ -2735,8 +2742,8 @@ msgstr "네트워크 연결중: %q"
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Kernel 로그"
 
@@ -2812,16 +2819,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "임대 시간"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2848,12 +2856,12 @@ msgstr ""
 msgid "Limit"
 msgstr "제한"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 "DNS 를 제공하기로한 subnet 인터페이스들에 대해서만 DNS 서비스를 제공합니다."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2877,7 +2885,7 @@ msgstr ""
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2905,15 +2913,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2926,12 +2934,12 @@ msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 "지정한 인터페이스에만 listening 하며 미지정시 모든 인터페이스에 적용됩니다"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "부하"
 
@@ -2939,10 +2947,6 @@ msgstr "부하"
 msgid "Load Average"
 msgstr "부하 평균"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -2975,7 +2979,7 @@ msgstr ""
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -2988,31 +2992,31 @@ msgstr "Local 시작 프로그램"
 msgid "Local Time"
 msgstr "지역 시간"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr ""
 
@@ -3020,7 +3024,7 @@ msgstr ""
 msgid "Log output level"
 msgstr "Log output 레벨"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr ""
 
@@ -3032,7 +3036,7 @@ msgstr ""
 msgid "Login"
 msgstr "로그인"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "로그아웃"
 
@@ -3129,15 +3133,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Active DHCP lease 건의 최대 허용 숫자"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "허용되는 최대 동시 DNS query 수"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "허용된 최대 EDNS.0 UDP 패킷 크기"
 
@@ -3277,6 +3281,7 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -3368,11 +3373,10 @@ msgstr "이름"
 msgid "Name of the new network"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3380,14 +3384,15 @@ msgstr ""
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "네트워크"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "네트워크 유틸리티"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "네트워크 boot 이미지"
 
@@ -3445,13 +3450,13 @@ msgstr "이용 가능한 정보가 없습니다"
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "암호 설정을 해주세요!"
@@ -3497,7 +3502,7 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3539,11 +3544,11 @@ msgstr ""
 msgid "Notice"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3590,7 +3595,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
@@ -3767,7 +3772,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "개요"
 
@@ -3995,8 +4000,9 @@ msgstr ""
 msgid "Physical Settings"
 msgstr "Physical 설정"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4072,7 +4078,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4085,7 +4091,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "프로세스"
 
@@ -4142,7 +4148,7 @@ msgstr ""
 msgid "Quality"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4209,7 +4215,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4221,7 +4227,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "정말 프로토콜 변경을 원하세요?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "실시간 그래프"
 
@@ -4229,12 +4235,13 @@ msgstr "실시간 그래프"
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "재부팅"
 
@@ -4362,7 +4369,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4408,11 +4415,11 @@ msgstr "Counter 초기화"
 msgid "Reset to defaults"
 msgstr "초기값으로 reset"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Resolv 와 Hosts 파일"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Resolve 파일"
 
@@ -4464,7 +4471,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "TFTP 를 통해 제공되는 파일들의 root 디렉토리"
 
@@ -4490,12 +4497,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "라우터 암호"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Route 경로"
 
@@ -4533,6 +4541,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4550,6 +4559,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4594,6 +4604,7 @@ msgstr "Scan 하기"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "작업 관리"
 
@@ -4633,7 +4644,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "서버 설정"
 
@@ -4646,7 +4657,7 @@ msgstr ""
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "서비스"
 
@@ -4737,7 +4748,7 @@ msgstr ""
 msgid "Size"
 msgstr "Size"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4750,11 +4761,11 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr ""
 
@@ -4855,6 +4866,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "시작 프로그램"
 
@@ -4866,11 +4878,11 @@ msgstr "Static IPv4 Route 경로"
 msgid "Static IPv6 Routes"
 msgstr "Static IPv6 Route 경로"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Static Lease 들"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Static Route 경로"
 
@@ -4880,7 +4892,7 @@ msgstr "Static Route 경로"
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4894,10 +4906,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "상태"
 
@@ -4907,7 +4919,7 @@ msgstr "상태"
 msgid "Stop"
 msgstr "정지"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Strict order"
 
@@ -4920,11 +4932,11 @@ msgstr ""
 msgid "Submit"
 msgstr "제출하기"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4933,7 +4945,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "스위치"
 
@@ -4981,15 +4993,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr "브라우저 시간대로 동기화"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "시스템"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "시스템 로그"
 
@@ -5005,11 +5018,11 @@ msgstr "System log 버퍼 크기"
 msgid "TCP:"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "TFTP 설정"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "TFTP 서버 root"
 
@@ -5232,7 +5245,8 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5242,9 +5256,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5265,7 +5279,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5303,7 +5317,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5375,14 +5389,15 @@ msgstr ""
 msgid "Total Available"
 msgstr "총 이용 가능한 양"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "트래픽"
 
@@ -5610,7 +5625,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "가동 시간"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "<code>/etc/ethers</code> 사용"
 
@@ -5721,7 +5736,7 @@ msgstr "Gateway metric 사용"
 msgid "Use routing table"
 msgstr "Routing table 사용"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5775,7 +5790,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5853,10 +5868,6 @@ msgid ""
 "and ad-hoc mode) to be installed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "실행한 명령이 끝나기를 기다리는 중입니다..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5891,9 +5902,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "무선"
 
@@ -5941,7 +5952,7 @@ msgstr "무선 네트워크가 꺼져 있음"
 msgid "Wireless network is enabled"
 msgstr "무선 네트워크가 켜져 있음"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "받은 DNS 요청 내용을 systlog 에 기록합니다"
 
@@ -5971,9 +5982,9 @@ msgstr ""
 "와 같은 중요 init script 를 비활성화 할 경우, 장치에 접속을 못하실 수 있습니"
 "다!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -5995,7 +6006,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr ""
 
@@ -6084,13 +6095,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "만료됨"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6144,7 +6156,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "local <abbr title=\"Domain Name System\">DNS</abbr> 파일"
 
@@ -6181,16 +6193,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr ""
@@ -6268,8 +6280,9 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6297,6 +6310,7 @@ msgid "untagged"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6309,6 +6323,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6337,6 +6352,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6396,6 +6412,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6421,6 +6440,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6468,6 +6488,9 @@ msgstr ""
 msgid "« Back"
 msgstr ""
 
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "실행한 명령이 끝나기를 기다리는 중입니다..."
+
 #~ msgid "Realtime Connections"
 #~ msgstr "실시간 연결수"
 
diff --git a/modules/luci-base/po/mr/base.po b/modules/luci-base/po/mr/base.po
index bf19d6015..a1c172385 100644
--- a/modules/luci-base/po/mr/base.po
+++ b/modules/luci-base/po/mr/base.po
@@ -39,6 +39,8 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -145,15 +147,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -163,7 +165,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr ""
@@ -188,12 +190,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
@@ -201,28 +204,28 @@ msgstr ""
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
@@ -338,6 +341,7 @@ msgstr ""
 msgid "Active DHCP Leases"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr ""
@@ -393,7 +397,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
@@ -406,11 +410,11 @@ msgstr ""
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -431,12 +435,13 @@ msgstr "पत्ता"
 msgid "Address to access local relay bridge"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -465,17 +470,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -499,7 +504,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr ""
 
@@ -515,7 +520,7 @@ msgstr ""
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -686,7 +691,7 @@ msgstr ""
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr ""
 
@@ -694,11 +699,11 @@ msgstr ""
 msgid "Authorization Required"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -792,6 +797,7 @@ msgid "Backup"
 msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -800,10 +806,6 @@ msgstr ""
 msgid "Backup file list"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr ""
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -821,7 +823,7 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -841,7 +843,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr ""
 
@@ -1027,10 +1029,11 @@ msgid "Close list..."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "डेटा संकलित करीत आहे ..."
 
@@ -1059,7 +1062,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr ""
@@ -1099,7 +1101,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr ""
 
@@ -1192,8 +1194,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr ""
 
@@ -1228,7 +1230,7 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr ""
 
@@ -1236,11 +1238,11 @@ msgstr ""
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1269,6 +1271,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1407,8 +1410,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr ""
 
@@ -1465,7 +1467,7 @@ msgstr ""
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
@@ -1499,7 +1501,7 @@ msgstr ""
 msgid "Distance to farthest network member in meters."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1507,15 +1509,15 @@ msgid ""
 "firewalls"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1535,11 +1537,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr ""
 
@@ -1547,7 +1549,7 @@ msgstr ""
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1688,7 +1690,7 @@ msgstr ""
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr ""
 
@@ -1808,11 +1810,11 @@ msgstr ""
 msgid "Ethernet Switch"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr ""
 
@@ -1821,6 +1823,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1897,7 +1906,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1906,11 +1915,11 @@ msgstr ""
 msgid "Filesystem"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr ""
 
@@ -1933,7 +1942,7 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr ""
 
@@ -1957,7 +1966,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2085,7 +2094,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2124,9 +2133,9 @@ msgstr ""
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr ""
@@ -2177,6 +2186,7 @@ msgstr ""
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2200,7 +2210,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2213,7 +2223,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr ""
 
@@ -2251,13 +2261,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
@@ -2325,6 +2335,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2335,8 +2347,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr ""
@@ -2406,6 +2416,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2497,7 +2508,7 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
@@ -2505,7 +2516,7 @@ msgstr ""
 msgid "Ignore interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr ""
 
@@ -2557,10 +2568,6 @@ msgstr ""
 msgid "Initscripts"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr ""
@@ -2622,7 +2629,7 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr ""
 
@@ -2677,9 +2684,9 @@ msgid ""
 "flash memory, please verify the image file!"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr ""
@@ -2700,8 +2707,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr ""
 
@@ -2777,16 +2784,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2813,11 +2821,11 @@ msgstr ""
 msgid "Limit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2841,7 +2849,7 @@ msgstr ""
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2869,15 +2877,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2889,12 +2897,12 @@ msgstr ""
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr ""
 
@@ -2902,10 +2910,6 @@ msgstr ""
 msgid "Load Average"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "लोड करीत आहे"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -2938,7 +2942,7 @@ msgstr ""
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -2951,31 +2955,31 @@ msgstr ""
 msgid "Local Time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr ""
 
@@ -2983,7 +2987,7 @@ msgstr ""
 msgid "Log output level"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr ""
 
@@ -2995,7 +2999,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr ""
 
@@ -3092,15 +3096,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
@@ -3240,6 +3244,7 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -3331,11 +3336,10 @@ msgstr ""
 msgid "Name of the new network"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3343,14 +3347,15 @@ msgstr ""
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr ""
 
@@ -3408,13 +3413,13 @@ msgstr ""
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr ""
@@ -3460,7 +3465,7 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3502,11 +3507,11 @@ msgstr ""
 msgid "Notice"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3553,7 +3558,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
@@ -3728,7 +3733,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr ""
 
@@ -3956,8 +3961,9 @@ msgstr ""
 msgid "Physical Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4033,7 +4039,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4046,7 +4052,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr ""
 
@@ -4103,7 +4109,7 @@ msgstr ""
 msgid "Quality"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4170,7 +4176,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4180,7 +4186,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr ""
 
@@ -4188,12 +4194,13 @@ msgstr ""
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr ""
 
@@ -4321,7 +4328,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4367,11 +4374,11 @@ msgstr ""
 msgid "Reset to defaults"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr ""
 
@@ -4423,7 +4430,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4449,12 +4456,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr ""
 
@@ -4490,6 +4498,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4507,6 +4516,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4551,6 +4561,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr ""
 
@@ -4590,7 +4601,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr ""
 
@@ -4603,7 +4614,7 @@ msgstr ""
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr ""
 
@@ -4694,7 +4705,7 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4707,11 +4718,11 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr ""
 
@@ -4812,6 +4823,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4823,11 +4835,11 @@ msgstr ""
 msgid "Static IPv6 Routes"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr ""
 
@@ -4837,7 +4849,7 @@ msgstr ""
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4848,10 +4860,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr ""
 
@@ -4861,7 +4873,7 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr ""
 
@@ -4874,11 +4886,11 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4887,7 +4899,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr ""
 
@@ -4935,15 +4947,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr ""
 
@@ -4959,11 +4972,11 @@ msgstr ""
 msgid "TCP:"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr ""
 
@@ -5181,7 +5194,8 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5191,9 +5205,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5212,7 +5226,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5245,7 +5259,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5313,14 +5327,15 @@ msgstr ""
 msgid "Total Available"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr ""
 
@@ -5548,7 +5563,7 @@ msgstr ""
 msgid "Uptime"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr ""
 
@@ -5659,7 +5674,7 @@ msgstr ""
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5708,7 +5723,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5786,10 +5801,6 @@ msgid ""
 "and ad-hoc mode) to be installed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr ""
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5824,9 +5835,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr ""
 
@@ -5874,7 +5885,7 @@ msgstr ""
 msgid "Wireless network is enabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
@@ -5900,9 +5911,9 @@ msgid ""
 "scripts like \"network\", your device might become inaccessible!</strong>"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -5924,7 +5935,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr ""
 
@@ -6013,13 +6024,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6071,7 +6083,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 
@@ -6108,16 +6120,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr ""
@@ -6195,8 +6207,9 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6224,6 +6237,7 @@ msgid "untagged"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6236,6 +6250,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6264,6 +6279,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6323,6 +6339,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6348,6 +6367,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6394,3 +6414,6 @@ msgstr ""
 #: modules/luci-compat/luasrc/view/cbi/delegator.htm:20
 msgid "« Back"
 msgstr ""
+
+#~ msgid "Loading"
+#~ msgstr "लोड करीत आहे"
diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po
index 4dc5da5e7..46dc754b5 100644
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -42,6 +42,8 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -148,15 +150,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -167,7 +169,7 @@ msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "<abbr title=\"perkhidmatan set mengenalpasti diperpanjangkan\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "IPv4-Alamat"
@@ -192,12 +194,13 @@ msgstr "IPv6 Host-Alamat atau Rangkaian (CIDR)"
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "IPv6-Pintu gerbang"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Konfigurasi lampu LED"
 
@@ -205,28 +208,28 @@ msgstr "Konfigurasi lampu LED"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "MAC-Alamat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
@@ -342,6 +345,7 @@ msgstr "Sambungan Aktif"
 msgid "Active DHCP Leases"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr ""
@@ -397,7 +401,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
@@ -410,11 +414,11 @@ msgstr ""
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -435,12 +439,13 @@ msgstr ""
 msgid "Address to access local relay bridge"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Pentadbiran"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -469,17 +474,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -503,7 +508,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr "Izinkan senarai saja"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr ""
 
@@ -519,7 +524,7 @@ msgstr ""
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -690,7 +695,7 @@ msgstr "Authentifizierung"
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Pengesahan"
 
@@ -698,11 +703,11 @@ msgstr "Pengesahan"
 msgid "Authorization Required"
 msgstr "Otorisasi Diperlukan"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -796,6 +801,7 @@ msgid "Backup"
 msgstr "Sandaran"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -804,10 +810,6 @@ msgstr ""
 msgid "Backup file list"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr ""
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -825,7 +827,7 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -845,7 +847,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr ""
 
@@ -1032,10 +1034,11 @@ msgid "Close list..."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr ""
 
@@ -1064,7 +1067,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Konfigurasi"
@@ -1104,7 +1106,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr ""
 
@@ -1197,8 +1199,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr ""
 
@@ -1233,7 +1235,7 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr ""
 
@@ -1241,11 +1243,11 @@ msgstr ""
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1274,6 +1276,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1412,8 +1415,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr ""
 
@@ -1470,7 +1472,7 @@ msgstr ""
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
@@ -1505,7 +1507,7 @@ msgid "Distance to farthest network member in meters."
 msgstr "Jarak ke rangkaian terjauh ahli dalam meter."
 
 # Nur für NAT-Firewalls?
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1517,15 +1519,15 @@ msgstr ""
 "Forwarder untuk <abbr title=\"Network Address Translation\">NAT</abbr> "
 "firewall"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1545,11 +1547,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Domain diperlukan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr ""
 
@@ -1557,7 +1559,7 @@ msgstr ""
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1699,7 +1701,7 @@ msgstr ""
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr ""
 
@@ -1819,11 +1821,11 @@ msgstr "Ethernet Adapter"
 msgid "Ethernet Switch"
 msgstr "Ethernet Beralih"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr ""
 
@@ -1832,6 +1834,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1908,7 +1917,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1917,11 +1926,11 @@ msgstr ""
 msgid "Filesystem"
 msgstr "Fail Sistem"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Penapis swasta"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Penapis tak berguna"
 
@@ -1944,7 +1953,7 @@ msgstr ""
 msgid "Finish"
 msgstr "Selesai"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -1968,7 +1977,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2096,7 +2105,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2135,9 +2144,9 @@ msgstr ""
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr ""
@@ -2190,6 +2199,7 @@ msgstr "Menyembunyikan ESSID"
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2213,7 +2223,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2226,7 +2236,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Nama Host"
 
@@ -2264,13 +2274,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
@@ -2338,6 +2348,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2348,8 +2360,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "Konfigurasi IPv6"
@@ -2419,6 +2429,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2515,7 +2526,7 @@ msgstr ""
 "sangat lambat kerana peranti-penukar tidak boleh diakses dengan datarates "
 "yang tinggi pada RAM."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Mengabaikan /etc/hosts"
 
@@ -2523,7 +2534,7 @@ msgstr "Mengabaikan /etc/hosts"
 msgid "Ignore interface"
 msgstr "Abaikan antara muka"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Abaikan fail yang selesai"
 
@@ -2575,10 +2586,6 @@ msgstr ""
 msgid "Initscripts"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr ""
@@ -2640,7 +2647,7 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Interface"
 
@@ -2698,9 +2705,9 @@ msgstr ""
 "Tampak bahawa anda cuba untuk flash fail gambar yang tidak sesuai dengan "
 "memori flash, sila buat pengesahan pada fail gambar!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr ""
@@ -2722,8 +2729,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Log Kernel"
 
@@ -2799,16 +2806,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Sewa fail"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2835,11 +2843,11 @@ msgstr ""
 msgid "Limit"
 msgstr "Batas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2863,7 +2871,7 @@ msgstr ""
 msgid "Link On"
 msgstr "Link Pada"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2891,15 +2899,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2911,12 +2919,12 @@ msgstr ""
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Load"
 
@@ -2924,10 +2932,6 @@ msgstr "Load"
 msgid "Load Average"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -2960,7 +2964,7 @@ msgstr ""
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -2973,31 +2977,31 @@ msgstr ""
 msgid "Local Time"
 msgstr "Masa Tempatan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Soalan tempatan"
 
@@ -3005,7 +3009,7 @@ msgstr "Soalan tempatan"
 msgid "Log output level"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Log soalan"
 
@@ -3017,7 +3021,7 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Logout"
 
@@ -3114,15 +3118,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
@@ -3262,6 +3266,7 @@ msgstr "Mount Point"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Mount Points"
 
@@ -3355,11 +3360,10 @@ msgstr "Nama"
 msgid "Name of the new network"
 msgstr "Nama rangkaian baru"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navigation"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3367,14 +3371,15 @@ msgstr "Navigation"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Rangkaian"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr ""
 
@@ -3432,13 +3437,13 @@ msgstr ""
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr ""
@@ -3484,7 +3489,7 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3526,11 +3531,11 @@ msgstr ""
 msgid "Notice"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3577,7 +3582,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
@@ -3752,7 +3757,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Keseluruhan"
 
@@ -3980,8 +3985,9 @@ msgstr ""
 msgid "Physical Settings"
 msgstr "Tetapan Fizikal"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4057,7 +4063,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4070,7 +4076,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Proses"
 
@@ -4127,7 +4133,7 @@ msgstr ""
 msgid "Quality"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4195,7 +4201,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4205,7 +4211,7 @@ msgstr "Baca /etc/ethers untuk mengkonfigurasikan DHCP-Server"
 msgid "Really switch protocol?"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr ""
 
@@ -4213,12 +4219,13 @@ msgstr ""
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reboot"
 
@@ -4346,7 +4353,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4392,11 +4399,11 @@ msgstr "Reset Loket"
 msgid "Reset to defaults"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr ""
 
@@ -4448,7 +4455,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4474,12 +4481,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Laluan"
 
@@ -4517,6 +4525,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4534,6 +4543,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4578,6 +4588,7 @@ msgstr "Scan"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Tugas Jadual"
 
@@ -4617,7 +4628,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr ""
 
@@ -4630,7 +4641,7 @@ msgstr ""
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Perkhidmatan"
 
@@ -4721,7 +4732,7 @@ msgstr ""
 msgid "Size"
 msgstr "Saiz"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4734,11 +4745,11 @@ msgstr ""
 msgid "Skip"
 msgstr "Skip"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Skip ke kadar"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Skip ke navigation"
 
@@ -4839,6 +4850,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4850,11 +4862,11 @@ msgstr "Laluan IPv4 Statik"
 msgid "Static IPv6 Routes"
 msgstr "Laluan IPv6 Statik"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Statische Einträge"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Laluan Statik"
 
@@ -4864,7 +4876,7 @@ msgstr "Laluan Statik"
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4875,10 +4887,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Status"
 
@@ -4888,7 +4900,7 @@ msgstr "Status"
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Order Ketat"
 
@@ -4901,11 +4913,11 @@ msgstr ""
 msgid "Submit"
 msgstr "Menyerahkan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4914,7 +4926,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Beralih"
 
@@ -4962,15 +4974,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistem"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Log Sistem"
 
@@ -4986,11 +4999,11 @@ msgstr ""
 msgid "TCP:"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr ""
 
@@ -5218,7 +5231,8 @@ msgstr ""
 "Format Fail gambar yang diupload tidak disokongkan. Pastikan anda memilih "
 "fail format gambar yang generik untuk platform anda."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5228,9 +5242,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5249,7 +5263,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5282,7 +5296,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5354,14 +5368,15 @@ msgstr ""
 msgid "Total Available"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Lalu lintas"
 
@@ -5589,7 +5604,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Masa Aktif"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Guna /etc/ethers"
 
@@ -5700,7 +5715,7 @@ msgstr ""
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5749,7 +5764,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5829,10 +5844,6 @@ msgstr ""
 "WPA-Enkripsi memerlukan pemohan wpa (untuk mod pelanggan) atau hostapd "
 "(untuk AP dan mod ad-hoc) yang akan dipasangkan."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr ""
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5867,9 +5878,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr ""
 
@@ -5917,7 +5928,7 @@ msgstr ""
 msgid "Wireless network is enabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
@@ -5943,9 +5954,9 @@ msgid ""
 "scripts like \"network\", your device might become inaccessible!</strong>"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -5967,7 +5978,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr ""
 
@@ -6056,13 +6067,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6114,7 +6126,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Fail DNS tempatan"
 
@@ -6151,16 +6163,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr ""
@@ -6238,8 +6250,9 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6267,6 +6280,7 @@ msgid "untagged"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6279,6 +6293,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6307,6 +6322,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6366,6 +6382,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6391,6 +6410,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index 430e3b552..8fa9ae472 100644
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -39,6 +39,8 @@ msgstr "(%d minutters vindu, %d sekunds intervall)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -145,15 +147,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> spørre port"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -165,7 +167,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Adresse"
@@ -192,12 +194,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Konfigurasjon"
 
@@ -205,16 +208,16 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Konfigurasjon"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Navn"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Adresse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -222,7 +225,7 @@ msgstr ""
 "<abbr title=\"maximal\">Maksimalt antall</abbr> <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-tildelninger"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -230,7 +233,7 @@ msgstr ""
 "<abbr title=\"Maksimal\">Maks.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> pakke størrelse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"Maksimal\">Maks.</abbr> samtidige spørringer"
 
@@ -353,6 +356,7 @@ msgstr "Aktive Tilkoblinger"
 msgid "Active DHCP Leases"
 msgstr "Aktive DHCP Leier"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Aktive DHCPv6 Leier"
@@ -408,7 +412,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Legg det lokale domenesuffikset til navn utgitt fra vertsfiler"
 
@@ -421,11 +425,11 @@ msgstr "Legg til grensesnitt..."
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Tilleggs vertsfiler"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -446,12 +450,13 @@ msgstr "Adresse"
 msgid "Address to access local relay bridge"
 msgstr "Adresse for tilgang til lokal relébro"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administrasjon"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -480,17 +485,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -514,7 +519,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr "Tillat kun oppførte"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Tillat lokalvert"
 
@@ -530,7 +535,7 @@ msgstr "Tillat root pålogginger med passord"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Tillat bruker <em>root</em> å logge inn med passord"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr "Tillat oppstrøms svar i 127.0.0.0/8 nettet, f.eks for RBL tjenester"
@@ -701,7 +706,7 @@ msgstr "Godkjenning"
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Autoritativ"
 
@@ -709,11 +714,11 @@ msgstr "Autoritativ"
 msgid "Authorization Required"
 msgstr "Autorisasjon er nødvendig"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -807,6 +812,7 @@ msgid "Backup"
 msgstr "Sikkerhetskopi"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Sikkerhetskopiering/Firmware oppgradering"
 
@@ -815,10 +821,6 @@ msgstr "Sikkerhetskopiering/Firmware oppgradering"
 msgid "Backup file list"
 msgstr "Sikkerhetskopier filliste"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Ugyldig adresse oppgitt!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -839,7 +841,7 @@ msgstr ""
 "konfigurasjonsfiler som er merket av opkg, essensielle enhets filer og andre "
 "filer valgt av bruker."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -859,7 +861,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Overstyr falske NX Domener"
 
@@ -1055,10 +1057,11 @@ msgid "Close list..."
 msgstr "Lukk liste..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Samler inn data…"
 
@@ -1087,7 +1090,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Konfigurasjon"
@@ -1127,7 +1129,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Tilkoblinger"
 
@@ -1222,8 +1224,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr "DHCP Server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP og DNS"
 
@@ -1258,7 +1260,7 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "DNS videresendinger"
 
@@ -1266,11 +1268,11 @@ msgstr "DNS videresendinger"
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1299,6 +1301,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1439,8 +1442,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Nettverksdiagnostikk"
 
@@ -1499,7 +1501,7 @@ msgstr "Deaktivert"
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Forkast oppstrøms RFC1918 svar"
 
@@ -1533,7 +1535,7 @@ msgstr "Avstand Optimalisering"
 msgid "Distance to farthest network member in meters."
 msgstr "Avstand i meter til det medlem av nettverket som er lengst unna."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1545,17 +1547,17 @@ msgstr ""
 "Fremsender for <abbr title =\"Network Address Translation\">NAT</abbr> "
 "brannmurer"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr "Ikke cache negative svar, f.eks for ikke eksisterende domener"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Ikke videresend forespørsler som ikke kan besvares med offentlige "
 "navneservere"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Ikke videresend reverserte oppslag for lokale nettverk"
 
@@ -1575,11 +1577,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Domene kreves"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Domene hviteliste"
 
@@ -1587,7 +1589,7 @@ msgstr "Domene hviteliste"
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1735,7 +1737,7 @@ msgstr "Aktiver NTP klient"
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Aktiver TFTP server"
 
@@ -1855,11 +1857,11 @@ msgstr "Ethernet Tilslutning"
 msgid "Ethernet Switch"
 msgstr "Ethernet Svitsj"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Utvid vertsliste"
 
@@ -1868,6 +1870,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1945,7 +1954,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "Filnavn fra boot image annonsert til klienter"
 
@@ -1954,11 +1963,11 @@ msgstr "Filnavn fra boot image annonsert til klienter"
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Filtrer private"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Filtrer ubrukelige"
 
@@ -1981,7 +1990,7 @@ msgstr "Finn og koble til nettverk"
 msgid "Finish"
 msgstr "Fullfør"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Brannmur"
 
@@ -2005,7 +2014,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Firmware Versjon"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Fast kilde port for utgående DNS-spørringer"
 
@@ -2134,7 +2143,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2173,9 +2182,9 @@ msgstr ""
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Gå til passord konfigurasjon..."
@@ -2228,6 +2237,7 @@ msgstr "Skjul <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2252,7 +2262,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2265,7 +2275,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "Vertsnavn som sendes ved DHCP forespørsel"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Vertsnavn"
 
@@ -2303,13 +2313,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2377,6 +2387,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2387,8 +2399,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2458,6 +2468,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2553,7 +2564,7 @@ msgstr ""
 "\"Random Access Memory\">RAM</abbr>. Vær oppmerksom på at bruk av swap er "
 "mye langsommere en <abbr title=\"Random Access Memory\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
@@ -2561,7 +2572,7 @@ msgstr ""
 msgid "Ignore interface"
 msgstr "Ignorer grensesnitt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Ignorer oppslagsfil"
 
@@ -2613,10 +2624,6 @@ msgstr "Oppstartskript"
 msgid "Initscripts"
 msgstr "Oppstartsskript"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Installer protokoll utvidelser..."
@@ -2678,7 +2685,7 @@ msgstr "Grensesnittet er ikke tilgjengelig eller er ikke tilknyttet."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Grensesnitt"
 
@@ -2736,9 +2743,9 @@ msgstr ""
 "Det virker som du prøver å flashe med en firmware som ikke passer inn i "
 "flash-minnet, vennligst kontroller firmware filen!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "JavaScript kreves!"
@@ -2759,8 +2766,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Kjerne Logg"
 
@@ -2836,16 +2843,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "<abbr title=\"Leasefile\">Leie-fil</abbr>"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2872,11 +2880,11 @@ msgstr "Forklaring:"
 msgid "Limit"
 msgstr "Grense"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2900,7 +2908,7 @@ msgstr ""
 msgid "Link On"
 msgstr "Forbindelse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2930,15 +2938,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Liste over domener hvor en tillater RFC1918 svar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "Liste over verter som returneren falske NX domene resultater"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2951,12 +2959,12 @@ msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 "Lytt kun på det angitte grensesnitt, om ingen er angitt lyttes det på alle"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Lytte-port for innkommende DNS-spørring"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Belastning"
 
@@ -2964,10 +2972,6 @@ msgstr "Belastning"
 msgid "Load Average"
 msgstr "Belastning Gjennomsnitt"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Laster"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -3000,7 +3004,7 @@ msgstr "Lokal IPv4 adresse"
 msgid "Local IPv6 address"
 msgstr "Lokal IPv6 adresse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -3013,11 +3017,11 @@ msgstr "Lokal Oppstart"
 msgid "Local Time"
 msgstr "Lokal tid"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Lokalt domene"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 #, fuzzy
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
@@ -3026,15 +3030,15 @@ msgstr ""
 "Lokalt domene spesifikasjon. Navn som passer dette domenet blir aldri "
 "videresendt, de blir kun løst av DHCP eller vertsfiler"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr "Lokalt domenesuffiks lagt til DHCP navn og vertsfil oppføringer"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Lokal server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3042,7 +3046,7 @@ msgstr ""
 "Lokaliser vertsnavn avhengig av subnett hvis flere IP-adresser er "
 "tilgjengelig"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Lokalisere søk"
 
@@ -3050,7 +3054,7 @@ msgstr "Lokalisere søk"
 msgid "Log output level"
 msgstr "Logg nivå"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Logg spørringer"
 
@@ -3062,7 +3066,7 @@ msgstr "Logging"
 msgid "Login"
 msgstr "Logg inn"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Logg ut"
 
@@ -3159,15 +3163,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Maksimalt antall aktive DHCP leieavtaler"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Maksimalt antall samtidige DNS spørringer"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Maksimal tillatt størrelse på EDNS.0 UDP-pakker"
 
@@ -3307,6 +3311,7 @@ msgstr "Monterings Punkt"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Monterings Punkter"
 
@@ -3400,11 +3405,10 @@ msgstr "Navn"
 msgid "Name of the new network"
 msgstr "Navnet til det nye nettverket"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navigasjon"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3412,14 +3416,15 @@ msgstr "Navigasjon"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Nettverk"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Nettverks Verktøy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Nettverks boot image"
 
@@ -3477,13 +3482,13 @@ msgstr "Ingen informasjon tilgjengelig"
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Ingen negative cache"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Ruteren er ikke passordbeskyttet!"
@@ -3529,7 +3534,7 @@ msgstr "Støy:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3571,11 +3576,11 @@ msgstr ""
 msgid "Notice"
 msgstr "Merk"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3622,7 +3627,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr "Forsinkelse ved tilstand -På-"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "Enten Vertsnavn eller Mac-adresse må oppgis!"
 
@@ -3799,7 +3804,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr "Overstyr tabellen som brukes for interne ruter"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Oversikt"
 
@@ -4027,8 +4032,9 @@ msgstr "Phy Hastighet:"
 msgid "Physical Settings"
 msgstr "Fysiske Innstillinger"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ping"
 
@@ -4106,7 +4112,7 @@ msgstr ""
 "Annta at peer er uten forbindelse om angitt LCP ekko feiler, bruk verdi 0 "
 "for å overse feil"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4119,7 +4125,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Prosesser"
 
@@ -4176,7 +4182,7 @@ msgstr ""
 msgid "Quality"
 msgstr "Kvalitet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4243,7 +4249,7 @@ msgstr "Radius-Authentication-Server"
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4255,7 +4261,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "Vil du endre protokoll?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Grafer i sanntid"
 
@@ -4263,12 +4269,13 @@ msgstr "Grafer i sanntid"
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "Binde beskyttelse"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Omstart"
 
@@ -4396,7 +4403,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4442,11 +4449,11 @@ msgstr "Nullstill Tellere"
 msgid "Reset to defaults"
 msgstr "Nullstill til standard innstilling"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Oppslag og Vertsfiler"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "<abbr title=\"Resolvefile\">Oppslagsfil</abbr>"
 
@@ -4498,7 +4505,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Rot katalog for filer gitt fra TFTP"
 
@@ -4524,12 +4531,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Ruter Passord"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Ruter"
 
@@ -4567,6 +4575,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH Tilgang"
 
@@ -4584,6 +4593,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH-Nøkler"
 
@@ -4628,6 +4638,7 @@ msgstr "Skann"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Planlagte Oppgaver"
 
@@ -4669,7 +4680,7 @@ msgstr ""
 "Send LCP ekko forespørsler etter angitt intervall i sekunder, dette er kun "
 "gjeldene dersom feilterskelen er nådd"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Server Innstillinger"
 
@@ -4682,7 +4693,7 @@ msgstr "Tjeneste navn"
 msgid "Service Type"
 msgstr "Tjeneste type"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Tjenester"
 
@@ -4773,7 +4784,7 @@ msgstr "Signal:"
 msgid "Size"
 msgstr "Størrelse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4786,11 +4797,11 @@ msgstr ""
 msgid "Skip"
 msgstr "Gå videre"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Gå til innhold"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Gå til navigasjon"
 
@@ -4895,6 +4906,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Oppstart"
 
@@ -4906,11 +4918,11 @@ msgstr "Statiske IPv4 Ruter"
 msgid "Static IPv6 Routes"
 msgstr "Statiske IPv6 Ruter"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Statiske Leier"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Statiske Ruter"
 
@@ -4920,7 +4932,7 @@ msgstr "Statiske Ruter"
 msgid "Static address"
 msgstr "Statisk adresse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4934,10 +4946,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Status"
 
@@ -4947,7 +4959,7 @@ msgstr "Status"
 msgid "Stop"
 msgstr "Stop"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Streng overholdelse"
 
@@ -4960,11 +4972,11 @@ msgstr ""
 msgid "Submit"
 msgstr "Send"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4973,7 +4985,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Svitsj"
 
@@ -5021,15 +5033,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr "Synkroniser med nettleser"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "System"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "System Logg"
 
@@ -5045,11 +5058,11 @@ msgstr "System logg buffer størrelse"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "TFTP Innstillinger"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "TFTP server roten"
 
@@ -5286,7 +5299,8 @@ msgstr ""
 "Den opplastede programvaren er av et format som ikke støttes. Sørg for at du "
 "velger det generelle firmware-bildet for din plattform."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5296,9 +5310,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5319,7 +5333,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5359,7 +5373,7 @@ msgstr ""
 "Dette er den lokale endepunkt adressen som ble tildelt av tunnel 'broker', "
 "adressen ender vanligvis med <code>...:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5434,14 +5448,15 @@ msgstr ""
 msgid "Total Available"
 msgstr "Totalt Tilgjengelig"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Traceroute"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Trafikk"
 
@@ -5669,7 +5684,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Oppetid"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Bruk <code>/etc/ethers</code>"
 
@@ -5780,7 +5795,7 @@ msgstr "Bruk gateway metrikk"
 msgid "Use routing table"
 msgstr "Bruk rutingtabellen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 #, fuzzy
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
@@ -5836,7 +5851,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr "VLANs på %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5916,10 +5931,6 @@ msgstr ""
 "WPA-Kryptering krever at wpa_supplicant (for klient-modus) eller hostapd "
 "(for AP og ad-hoc-modus) er installert."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "Venter på at kommando fullføres..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5954,9 +5965,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Trådløs"
 
@@ -6004,7 +6015,7 @@ msgstr "Trådløst nettverk er deaktivert"
 msgid "Wireless network is enabled"
 msgstr "Trådløst nettverk er aktivert"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Skriv mottatte DNS forespørsler til syslog"
 
@@ -6034,9 +6045,9 @@ msgstr ""
 "deaktiverer nødvendige init skript som f.eks. \"nettverk\", kan enheten bli "
 "utilgjengelig! </strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6060,7 +6071,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "enhver"
 
@@ -6149,13 +6160,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "utgått"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6209,7 +6221,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "lokal <abbr title=\"Domain Navn System\">DNS</abbr>-fil"
 
@@ -6246,16 +6258,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "av"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "på"
@@ -6333,8 +6345,9 @@ msgstr ""
 msgid "unknown"
 msgstr "ukjent"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6362,6 +6375,7 @@ msgid "untagged"
 msgstr "utagget"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6374,6 +6388,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6402,6 +6417,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6461,6 +6477,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6486,6 +6505,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6533,6 +6553,15 @@ msgstr "ja"
 msgid "« Back"
 msgstr "« Tilbake"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Ugyldig adresse oppgitt!"
+
+#~ msgid "Loading"
+#~ msgstr "Laster"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "Venter på at kommando fullføres..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Tilknytt grensesnitt..."
 
diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index ebe3ae3dd..e7aaff13c 100644
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -44,6 +44,8 @@ msgstr "(okno %d minut, interwał %d sekund)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -150,15 +152,15 @@ msgstr "802.11w Interwał ponawiania prób"
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "Port wywołania <abbr title=\"Domain Name System\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "Port serwera <abbr title=\"Domain Name System\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -170,7 +172,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Adres <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -196,12 +198,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Brama <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr "Sufiks <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>(hex)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Konfiguracja diod <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
@@ -209,16 +212,16 @@ msgstr "Konfiguracja diod <abbr title=\"Light Emitting Diode\">LED</abbr>"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Nazwa diody <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Adres <abbr title=\"Media Access Control\">MAC</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr "<abbr title=\"Unikatowy Identyfikator DHCP\">DUID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -226,7 +229,7 @@ msgstr ""
 "<abbr title=\"Maksymalna ilość\">Maks.</abbr> dzierżaw <abbr title=\"Dynamic "
 "Host Configuration Protocol\">DHCP</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -234,7 +237,7 @@ msgstr ""
 "<abbr title=\"Maksymalny\">Maks.</abbr> rozmiar pakietu <abbr title="
 "\"Extension Mechanisms for Domain Name System\">EDNS0</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"Maksymalna ilość\">Maks.</abbr> zapytań równoczesnych"
 
@@ -362,6 +365,7 @@ msgstr "Aktywne połączenia"
 msgid "Active DHCP Leases"
 msgstr "Aktywne dzierżawy DHCP"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Aktywne dzierżawy DHCPv6"
@@ -417,7 +421,7 @@ msgstr "Dodaj instancję"
 msgid "Add key"
 msgstr "Dodaj klucz"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Dodaj lokalny sufiks domeny do nazw urządzeń z pliku hosts"
 
@@ -430,11 +434,11 @@ msgstr "Dodaj nowy interfejs..."
 msgid "Add peer"
 msgstr "Dodaj peera"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Dodatkowe pliki Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "Dodatkowe pliki serwera"
 
@@ -456,12 +460,13 @@ msgstr "Adres"
 msgid "Address to access local relay bridge"
 msgstr "Adres dostępowy do \"relay bridge\""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Zarządzanie"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -490,18 +495,18 @@ msgstr "Alias Interfejsu"
 msgid "Alias of \"%s\""
 msgstr "Alias \"%s\""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr "Wszystkie serwery"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 "Przydziel sekwencyjnie adresy IP, zaczynając od najmniejszego dostępnego"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr "Przydzielaj adresy IP po kolei"
 
@@ -525,7 +530,7 @@ msgstr "Zezwalaj na starsze wersje 802.11b"
 msgid "Allow listed only"
 msgstr "Pozwól tylko wymienionym"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Pozwól tylko sobie (localhost)"
 
@@ -542,7 +547,7 @@ msgstr "Zezwól na logowanie roota przy pomocy hasła"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Pozwól użytkownikowi <em>root</em> na logowanie się przy pomocy hasła"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -723,7 +728,7 @@ msgstr "Uwierzytelnienie"
 msgid "Authentication Type"
 msgstr "Typ uwierzytelniania"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Autorytatywny"
 
@@ -731,11 +736,11 @@ msgstr "Autorytatywny"
 msgid "Authorization Required"
 msgstr "Wymagana autoryzacja"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -830,6 +835,7 @@ msgid "Backup"
 msgstr "Kopia zapasowa"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Kopia zapasowa / aktualizacja firmware"
 
@@ -838,10 +844,6 @@ msgstr "Kopia zapasowa / aktualizacja firmware"
 msgid "Backup file list"
 msgstr "Kopia zapasowa listy plików"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Wprowadzono zły adres!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -862,7 +864,7 @@ msgstr ""
 "Zawiera ona zmienione pliki konfiguracyjne oznaczone przez opkg, podstawowe "
 "pliki systemowe, oraz pliki oznaczone do kopiowania przez użytkownika."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -884,7 +886,7 @@ msgstr "Połącz tunel z tym interfejsem (opcjonalnie)."
 msgid "Bitrate"
 msgstr "Szybkość transmisji"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Podrobione statystyki NXDOMAIN"
 
@@ -1083,10 +1085,11 @@ msgid "Close list..."
 msgstr "Zamknij listę..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Trwa zbieranie danych..."
 
@@ -1120,7 +1123,6 @@ msgstr ""
 "natężeniu ruchu."
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Konfiguracja"
@@ -1160,7 +1162,7 @@ msgstr "Próba połączenia nieudana"
 msgid "Connection lost"
 msgstr "Utrata połączenia"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Połączenia"
 
@@ -1261,8 +1263,8 @@ msgstr "DAE-Secret"
 msgid "DHCP Server"
 msgstr "Serwer DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP i DNS"
 
@@ -1297,7 +1299,7 @@ msgstr "Serwis DHCPv6"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "Przekierowania DNS"
 
@@ -1305,11 +1307,11 @@ msgstr "Przekierowania DNS"
 msgid "DNS-Label / FQDN"
 msgstr "DNS-Label / FQDN"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr "Sprawdzanie DNSSEC bez podpisu"
 
@@ -1338,6 +1340,7 @@ msgstr "Tryb linii DSL"
 msgid "DTIM Interval"
 msgstr "Interwał DTIM"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1478,8 +1481,7 @@ msgstr "Urządzenie nieosiągalne!"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "Urządzenie nieosiągalne! Wciąż czekam na urządzenie..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Diagnostyka"
 
@@ -1538,7 +1540,7 @@ msgstr "Wyłączone"
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Rozłączaj przy niskim stanie ramek ACK"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Odrzuć wychodzące odpowiedzi RFC1918"
 
@@ -1572,7 +1574,7 @@ msgstr "Optymalizacja odległości"
 msgid "Distance to farthest network member in meters."
 msgstr "Odległość do najdalej oddalonego członka sieci w metrach."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1584,17 +1586,17 @@ msgstr ""
 "\">DNS</abbr>. Jest to serwer przekazujący (Fowarder) dla firewalli <abbr "
 "title=\"Network Address Translation\">NAT</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr "Nie cache`uj odpowiedzi negatywnych, np. nie dla bieżących domen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Nie przekazuj zapytań które nie mogą być zrealizowane przez publiczne "
 "serwery nazw"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Nie przekazuj odwrotnych lookup`ów do sieci lokalnych"
 
@@ -1616,11 +1618,11 @@ msgstr ""
 "Czy jesteś pewien, że chcesz skasować katalog \"%s\" ze wszystkimi jego "
 "podkatalogami?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Wymagana domena"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Białe listy (Dozwolone domeny)"
 
@@ -1628,7 +1630,7 @@ msgstr "Białe listy (Dozwolone domeny)"
 msgid "Don't Fragment"
 msgstr "Nie Fragmentuj"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1781,7 +1783,7 @@ msgstr "Włącz klienta NTP"
 msgid "Enable Single DES"
 msgstr "Zezwól na Single DES"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Włącz serwer TFTP"
 
@@ -1905,11 +1907,11 @@ msgstr "Karta Ethernet"
 msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr "Wyklucz interfejsy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Rozwiń hosty"
 
@@ -1918,6 +1920,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr "Oczekiwanie na przydział w systemie szesnastkowym"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr "Spodziewano się: %s"
 
@@ -1995,7 +2004,7 @@ msgstr "Plik niedostępny"
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "Rozgłoszono nazwę pliku obrazu startowego do klientów"
 
@@ -2004,11 +2013,11 @@ msgstr "Rozgłoszono nazwę pliku obrazu startowego do klientów"
 msgid "Filesystem"
 msgstr "System plików"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Filtruj prywatne"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Filtruj bezużyteczne"
 
@@ -2033,7 +2042,7 @@ msgstr "Znajdź i podłącz się do sieci"
 msgid "Finish"
 msgstr "Zakończ"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Zapora"
 
@@ -2057,7 +2066,7 @@ msgstr "Plik firmware"
 msgid "Firmware Version"
 msgstr "Wersja firmware"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Stały port źródłowy dla wychodzących zapytań DNS"
 
@@ -2188,7 +2197,7 @@ msgstr "Adres bramy jest nieprawidłowy"
 msgid "Gateway metric"
 msgstr "Brama metryczna"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2229,9 +2238,9 @@ msgstr "Ustawienia globalne"
 msgid "Global network options"
 msgstr "Globalne opcje sieciowe"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Przejdź do konfiguracji hasła..."
@@ -2286,6 +2295,7 @@ msgstr ""
 msgid "Hide empty chains"
 msgstr "Ukryj puste łańcuchy"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2309,7 +2319,7 @@ msgid "Host-Uniq tag content"
 msgstr "Zawartość znacznika Host-Uniq"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2322,7 +2332,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "Nazwa hosta wysyłana podczas negocjacji DHCP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Nazwy hostów"
 
@@ -2360,13 +2370,13 @@ msgstr "Nieprawidłowy adres IP"
 msgid "IP address is missing"
 msgstr "Brakuje adresu IP"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2434,6 +2444,8 @@ msgstr "IPv4-in-IPv4 (RFC2003)"
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr "IPv4/IPv6 (oba - domyślnie IPv4)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2444,8 +2456,6 @@ msgstr "IPv4/IPv6 (oba - domyślnie IPv4)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2515,6 +2525,7 @@ msgstr "Kierowany prefiks IPv6"
 msgid "IPv6 suffix"
 msgstr "Sufiks IPv6"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2616,7 +2627,7 @@ msgstr ""
 "Memory\">RAM</abbr> będzie dostępna. Uwaga - plik wymiany jest dużo "
 "wolniejszy niż pamięć <abbr title=\"Random Access Memory\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignoruj <code>/etc/hosts</code>"
 
@@ -2624,7 +2635,7 @@ msgstr "Ignoruj <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Ignoruj interfejs"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Ignoruj pliki resolve"
 
@@ -2679,11 +2690,6 @@ msgstr "Skrypt startowy"
 msgid "Initscripts"
 msgstr "Skrypty startowe"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-"Zainstaluj iputils-traceroute6 w celu skorzystania z traceroute dla iPv6"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Instaluj rozszerzenia protokołów..."
@@ -2745,7 +2751,7 @@ msgstr "Interfejs nie istnieje lub nie jest jeszcze podłączony."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Interfejsy"
 
@@ -2802,9 +2808,9 @@ msgstr ""
 "Wygląda na to, że próbujesz wgrać obraz większy niż twoja pamięć flash, "
 "proszę sprawdź czy to właściwy obraz!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "JavaScript jest wymagany!"
@@ -2825,8 +2831,8 @@ msgstr "Przyłączanie do sieci: %q"
 msgid "Keep settings and retain the current configuration"
 msgstr "Zachowaj ustawienia i bieżącą konfigurację"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Log jądra"
 
@@ -2902,16 +2908,17 @@ msgstr "Opoźnienie"
 msgid "Leaf"
 msgstr "Karta"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "Czas dzierżawy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Plik dzierżawy"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2938,12 +2945,12 @@ msgstr "Legenda:"
 msgid "Limit"
 msgstr "Limit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 "Ogranicz usługi DNS do podsieci interfejsów, na których obsługujemy DNS."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "Ogranicz nasłuchiwanie do tych interfesjów, oraz loopbacku."
 
@@ -2967,7 +2974,7 @@ msgstr "Czas działania linii"
 msgid "Link On"
 msgstr "Połączenie aktywne"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2983,8 +2990,8 @@ msgid ""
 "from the R0KH that the STA used during the Initial Mobility Domain "
 "Association."
 msgstr ""
-"Lista R0KHs w tej samej Domenie Mobilnej. <br />Format: Adres-MAC"
-",Identyfikator-NAS,128-bitowy klucz jako ciąg szesnastkowy. <br />Tej listy "
+"Lista R0KHs w tej samej Domenie Mobilnej. <br />Format: Adres-MAC,"
+"Identyfikator-NAS,128-bitowy klucz jako ciąg szesnastkowy. <br />Tej listy "
 "używa się do mapowania R0KH-ID (Identyfikator NAS) do docelowego adresu MAC "
 "przy żądaniu klucza PMK-R1 z R0KH, którego STA używał podczas Initial "
 "Mobility Domain Association."
@@ -2998,8 +3005,8 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 "Lista R1KHs w tej samej Domenie Mobilnej. <br />Format: Adres-MAC,R1KH-ID "
-"jako 6 oktetów z dwukropkami,128-bitowy klucz jako ciąg szesnastkowy. <br />"
-"Tej listy używa się do mapowania R1KH-ID na docelowy adres MAC podczas "
+"jako 6 oktetów z dwukropkami,128-bitowy klucz jako ciąg szesnastkowy. <br /"
+">Tej listy używa się do mapowania R1KH-ID na docelowy adres MAC podczas "
 "wysyłania klucza PMK-R1 z R0KH. Jest to również lista autoryzowanych R1KH w "
 "MD, które mogą zażądać kluczy PMK-R1."
 
@@ -3007,15 +3014,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr "Lista kluczy SSH do autoryzacji"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Lista domen zezwalających na odpowiedzi RFC1918"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "Lista hostów które dostarczają zafałszowane wyniki NX domain"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr "Nasłuchuj interfejs"
 
@@ -3028,12 +3035,12 @@ msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 "Słuchaj tylko na podanym interfejsie, lub jeśli nie podano na wszystkich"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Port nasłuchu dla przychodzących zapytań DNS"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Obciążenie"
 
@@ -3041,10 +3048,6 @@ msgstr "Obciążenie"
 msgid "Load Average"
 msgstr "Średnie obciążenie"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Ładowanie"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr "Ładowanie zawartości katalogu.…"
@@ -3077,7 +3080,7 @@ msgstr "Lokalny adres IPv4"
 msgid "Local IPv6 address"
 msgstr "Lokalny adres IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr "Tylko serwis lokalny"
 
@@ -3090,11 +3093,11 @@ msgstr "Lokalny autostart"
 msgid "Local Time"
 msgstr "Czas lokalny"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Domena lokalna"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3102,16 +3105,16 @@ msgstr ""
 "Specyfikacja domeny lokalnej. Nazwy należące do tej domeny nie są "
 "przekazywane dalej ani rozwijane przez DHCP lub tylko pliki hosta"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 "Przyrostek (sufiks) domeny przyłączany do nazw DHCP i wpisów w pliku hosta"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Serwer lokalny"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3119,7 +3122,7 @@ msgstr ""
 "Zlokalizuj nazwę hosta w zależności od odpytującej podsieci jeśli jest "
 "dostępne więcej niż jedno IP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Zapytania lokalizujące"
 
@@ -3127,7 +3130,7 @@ msgstr "Zapytania lokalizujące"
 msgid "Log output level"
 msgstr "Poziom logowania"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Loguj zapytania"
 
@@ -3139,7 +3142,7 @@ msgstr "Logowanie"
 msgid "Login"
 msgstr "Zaloguj"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Wyloguj"
 
@@ -3238,15 +3241,15 @@ msgstr "Max. Osiągalna przepustowość danych (ATTNDR)"
 msgid "Maximum allowed Listen Interval"
 msgstr "Maksymalny dozwolony odstęp czasu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Maksymalna dozwolona liczba aktywnych dzierżaw DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Maksymalna dozwolona liczba jednoczesnych zapytań DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Maksymalny dozwolony rozmiar pakietu EDNS.0 UDP"
 
@@ -3386,6 +3389,7 @@ msgstr "Punkt montowania"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Punkty montowania"
 
@@ -3479,11 +3483,10 @@ msgstr "Nazwa"
 msgid "Name of the new network"
 msgstr "Nazwa nowej sieci"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Nawigacja"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3491,14 +3494,15 @@ msgstr "Nawigacja"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Sieć"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Narzędzia sieciowe"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Sieciowy obraz startowy"
 
@@ -3556,13 +3560,13 @@ msgstr "Brak dostępnych informacji"
 msgid "No matching prefix delegation"
 msgstr "Brak zgodnej delegacji prefiksu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Brak negatywnej pamięci cache"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Nie ustawiono hasła!"
@@ -3608,7 +3612,7 @@ msgstr "Szum:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "Nieprzewidziane błedy CRC (CRC_P)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr "Bez symboli wieloznacznych"
 
@@ -3650,11 +3654,11 @@ msgstr "Nie wspierane"
 msgid "Notice"
 msgstr "Spostrzeżenie"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 "Liczba buforowanych wpisów DNS (max wynosi 10000, 0 oznacza brak pamięci "
@@ -3703,7 +3707,7 @@ msgstr "Trasa na łączu"
 msgid "On-State Delay"
 msgstr "Zwłoka włączenia"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "Nazwa hosta lub adres MAC musu być podany!"
 
@@ -3892,7 +3896,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr "Nadpisz tablicę routingu używaną dla wewnętrznych tras routowania"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Przegląd"
 
@@ -4120,8 +4124,9 @@ msgstr "Szybkość Phy:"
 msgid "Physical Settings"
 msgstr "Ustawienia sprzętowe"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ping"
 
@@ -4199,7 +4204,7 @@ msgstr ""
 "Przypuszczaj że klient może być martwy po zadanej ilości błedów echa LCP, "
 "wpisz 0 aby zignorować te błędy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr "Zapobiegaj nasłuchiwaniu na tych interfejsach."
 
@@ -4212,7 +4217,7 @@ msgid "Private Key"
 msgstr "Klucz prywatny"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Procesy"
 
@@ -4275,7 +4280,7 @@ msgstr "Komórkowy QMI"
 msgid "Quality"
 msgstr "Jakość"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4346,7 +4351,7 @@ msgstr ""
 "Surowe bajty kodowane szesnastkowo. Pozostaw puste, chyba że wymaga tego "
 "dostawca internetowy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4358,7 +4363,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "Naprawdę zmienić protokół?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Wykresy w czasie rzeczywistym"
 
@@ -4366,12 +4371,13 @@ msgstr "Wykresy w czasie rzeczywistym"
 msgid "Reassociation Deadline"
 msgstr "Termin reasocjacji"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "Przypisz ochronę"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Restart"
 
@@ -4503,7 +4509,7 @@ msgstr ""
 "Wymagana jest 'pełna' wersja wpad/hostapd i wsparcie sterownika WiFi <br /"
 ">(od Sty. 2019: ath9k, ath10k, mwlwifi i mt76)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4551,11 +4557,11 @@ msgstr "Wyczyść liczniki"
 msgid "Reset to defaults"
 msgstr "Resetuj do domyślnych"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Pliki Resolv i Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Plik Resolve"
 
@@ -4607,7 +4613,7 @@ msgstr "Żądanie powrotu nie powiodło się ze statusem <code>%h</code>"
 msgid "Reverting configuration…"
 msgstr "Przywracanie konfiguracji…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Katalog Root`a dla plików udostępnianych przez TFTP"
 
@@ -4633,12 +4639,13 @@ msgstr "Serwis rozgłoszeniowy routera"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Hasło routera"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Ścieżki routingu"
 
@@ -4677,6 +4684,7 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Dostęp SSH"
 
@@ -4694,6 +4702,7 @@ msgstr "Nazwa użytkownika SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Klucze SSH"
 
@@ -4738,6 +4747,7 @@ msgstr "Skanuj"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Zaplanowane Zadania"
 
@@ -4782,7 +4792,7 @@ msgstr ""
 "Wysyłaj żądania echa LCP w określonym przedziale czasowym, efektywne tylko "
 "wtedy gdy jest ustawiony próg błedu LCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Ustawienia serwera"
 
@@ -4795,7 +4805,7 @@ msgstr "Nazwa usługi"
 msgid "Service Type"
 msgstr "Typ serwisu"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Usługi"
 
@@ -4888,7 +4898,7 @@ msgstr "Sygnał:"
 msgid "Size"
 msgstr "Rozmiar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr "Rozmiar cache zapytań DNS"
 
@@ -4901,11 +4911,11 @@ msgstr "Rozmiar ZRam urządzenia w megabajtach"
 msgid "Skip"
 msgstr "Pomiń"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Pomiń do zawartości"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Pomiń do nawigacji"
 
@@ -5019,6 +5029,7 @@ msgstr "Rozpoczynanie skanowania..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Autostart"
 
@@ -5030,11 +5041,11 @@ msgstr "Statyczne ścieżki routingu IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Statyczne ścieżki routingu IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Dzierżawy statyczne"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Statyczne ścieżki routingu"
 
@@ -5044,7 +5055,7 @@ msgstr "Statyczne ścieżki routingu"
 msgid "Static address"
 msgstr "Stały adres"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -5059,10 +5070,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr "Granica bezczynności stacji"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Status"
 
@@ -5072,7 +5083,7 @@ msgstr "Status"
 msgid "Stop"
 msgstr "Stop"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Zachowaj kolejność"
 
@@ -5085,11 +5096,11 @@ msgstr "Silne"
 msgid "Submit"
 msgstr "Wyślij"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr "Pomiń rejestrowanie"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Pomiń rejestrowanie rutynowych operacji dla tych protokołów"
 
@@ -5098,7 +5109,7 @@ msgid "Swap free"
 msgstr "Wolna pamięć Swap"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Przełącznik"
 
@@ -5147,15 +5158,16 @@ msgstr "Synchronizuj z serwerem NTP"
 msgid "Sync with browser"
 msgstr "Synchronizuj z przeglądarką"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "System"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Log systemowy"
 
@@ -5172,11 +5184,11 @@ msgstr "Rozmiar bufora loga systemu"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Ustawienia TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "Root serwera TFTP"
 
@@ -5436,7 +5448,8 @@ msgstr ""
 "Przesłany plik obrazu nie zawiera obsługiwanego formatu. Upewnij się, że "
 "wybrałeś odpowiedni format obrazu dla danej platformy."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5446,9 +5459,9 @@ msgstr "Nie ma aktywnych dzierżaw"
 msgid "There are no changes to apply"
 msgstr "Nie ma żadnych zmian do zastosowania"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5469,7 +5482,7 @@ msgstr "Ten typ uwierzytelniania nie ma zastosowania do wybranej metody EAP."
 msgid "This does not look like a valid PEM file"
 msgstr "Nie wygląda to na ważny plik PEM"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5516,7 +5529,7 @@ msgstr ""
 "kończący się z <code>...:2/64</code>"
 
 # w tłumaczeniu pojawiła się spacja po DHCP</abbr> co powoduje niepoprawne wyświetlanie się strony z lang PL
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5595,14 +5608,15 @@ msgstr "Ton"
 msgid "Total Available"
 msgstr "Całkowicie dostępna"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Trasa routowania"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Ruch"
 
@@ -5835,7 +5849,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Czas pracy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Użyj <code>/etc/ethers</code>"
 
@@ -5946,7 +5960,7 @@ msgstr "Użyj metryki bramy"
 msgid "Use routing table"
 msgstr "Użyj tabeli routingu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -6004,7 +6018,7 @@ msgstr "VDSL"
 msgid "VLANs on %q"
 msgstr "Sieci VLAN na %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr "VPN"
 
@@ -6084,10 +6098,6 @@ msgstr ""
 "Kodowanie WPA wymaga zainstalowanych modułów wpa_supplicant (tryb klienta) "
 "lub hostapd (tryb AP lub ad-hoc)."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "Oczekiwanie na polecenie do wykonania..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "Oczekiwanie na urządzenie..."
@@ -6127,9 +6137,9 @@ msgstr "Szerokość"
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Sieć bezprzewodowa"
 
@@ -6177,7 +6187,7 @@ msgstr "Sieć bezprzewodowa jest wyłączona"
 msgid "Wireless network is enabled"
 msgstr "Sieć bezprzewodowa jest włączona"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Zapisz otrzymane żądania DNS do syslog'a"
 
@@ -6209,9 +6219,9 @@ msgstr ""
 "Jeśli wyłączysz podstawowe skrypty typu \"network\", urządzenie może stać "
 "się nieosiągalne!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6235,7 +6245,7 @@ msgstr "Ustawienia ZRam"
 msgid "ZRam Size"
 msgstr "Rozmiar ZRam"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "dowolny"
 
@@ -6324,13 +6334,14 @@ msgstr "wyłączony"
 msgid "driver default"
 msgstr "domyślna sterownika"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "nieważny"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6384,7 +6395,7 @@ msgstr "klucz od 8 do 63 znaków"
 msgid "key with either 5 or 13 characters"
 msgstr "klucz z 5 lub 13 znakami"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "lokalny plik <abbr title=\"Domain Name System\">DNS</abbr>"
 
@@ -6422,16 +6433,16 @@ msgstr "nieobecny"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "wyłączone"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "włączone"
@@ -6509,8 +6520,9 @@ msgstr "unikalna wartość"
 msgid "unknown"
 msgstr "nieznane"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6538,6 +6550,7 @@ msgid "untagged"
 msgstr "nieotagowane"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr "prawidłowy adres IP"
 
@@ -6550,6 +6563,7 @@ msgid "valid IPv4 CIDR"
 msgstr "prawidłowy CIDR IPv4"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr "prawidłowy adres IPv4"
 
@@ -6578,6 +6592,7 @@ msgid "valid IPv6 CIDR"
 msgstr "prawidłowy protokół IPv6 CIDR"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr "prawidłowy adres IPv6"
 
@@ -6637,6 +6652,9 @@ msgstr "prawidłowy host:port"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr "prawidłowa nazwa hosta"
 
@@ -6662,6 +6680,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr "prawidłowy port lub zakres portów (PORT1-PORT2)"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr "prawidłowa wartość portu"
 
@@ -6709,6 +6728,19 @@ msgstr "tak"
 msgid "« Back"
 msgstr "« Wróć"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Wprowadzono zły adres!"
+
+#~ msgid "Install iputils-traceroute6 for IPv6 traceroute"
+#~ msgstr ""
+#~ "Zainstaluj iputils-traceroute6 w celu skorzystania z traceroute dla iPv6"
+
+#~ msgid "Loading"
+#~ msgstr "Ładowanie"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "Oczekiwanie na polecenie do wykonania..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Przypisz interfejsy..."
 
diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po
index c053dcbf3..988e3d098 100644
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -43,6 +43,8 @@ msgstr "(janela de %d minutos, intervalo de %d segundos)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -154,17 +156,17 @@ msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 "<abbr title=\"Identificador de Conjunto Básico de Serviços\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 "Porta de consulta <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr ""
 "Porta do servidor <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -177,7 +179,7 @@ msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "<abbr title=\"Identificador de Conjunto de Serviços Estendidos\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Endereço <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
@@ -205,7 +207,7 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Roteador <abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 "<abbr title=\"Internet Protocol Version 6/Protocolo Internet Versão "
@@ -213,6 +215,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuração do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
@@ -220,16 +223,16 @@ msgstr "Configuração do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Nome do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Endereço <abbr title=\"Controle de Acesso ao Meio\">MAC</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr "<abbr title=\"Identificador Único do DHCP\">DUID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -237,7 +240,7 @@ msgstr ""
 "Numero máximo de concessões <abbr title=\"Protocolo de Configuração Dinâmica "
 "de Equipamentos\">DHCP</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -245,7 +248,7 @@ msgstr ""
 "Tamanho máximo do pacote do <abbr title=\"Extension Mechanisms for Domain "
 "Name System\">EDNS0</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "Número máximo de consultas concorrentes"
 
@@ -376,6 +379,7 @@ msgstr "Conexões Ativas"
 msgid "Active DHCP Leases"
 msgstr "Alocações DHCP ativas"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Alocações DHCPv6 ativas"
@@ -431,7 +435,7 @@ msgstr "Adicionar instância"
 msgid "Add key"
 msgstr "Adicionar chave"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Adiciona um sufixo de domínio local para equipamentos conhecidos"
 
@@ -444,11 +448,11 @@ msgstr "Adiciona uma nova interface..."
 msgid "Add peer"
 msgstr "Adicionar parceiro"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Arquivos adicionais de equipamentos conhecidos (hosts)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "Arquivo de servidores adicionais"
 
@@ -469,12 +473,13 @@ msgstr "Endereço"
 msgid "Address to access local relay bridge"
 msgstr "Endereço para acessar a ponte por retransmissão local"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administração"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -505,11 +510,11 @@ msgstr "Interface Adicional"
 msgid "Alias of \"%s\""
 msgstr "Interface adicional de \"%s\""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr "Todos os Servidores"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
@@ -517,7 +522,7 @@ msgstr ""
 "Alocar endereços IP sequencialmente, iniciando a partir do endereço mais "
 "baixo disponível"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr "Alocar endereços IP sequencialmente"
 
@@ -544,7 +549,7 @@ msgstr "Permitir taxas legadas do 802.11b"
 msgid "Allow listed only"
 msgstr "Permitir somente os listados"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Permitir computador local"
 
@@ -562,7 +567,7 @@ msgstr "Permite autenticação do root com senha"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Permite que o usuário <em>root</em> se autentique utilizando senha"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -743,7 +748,7 @@ msgstr "Autenticação"
 msgid "Authentication Type"
 msgstr "Tipo de Autenticação"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Autoritário"
 
@@ -751,11 +756,11 @@ msgstr "Autoritário"
 msgid "Authorization Required"
 msgstr "Autenticação Obrigatória"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -853,6 +858,7 @@ msgid "Backup"
 msgstr "Cópia de Segurança"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Cópia de Segurança / Gravar Firmware"
 
@@ -861,10 +867,6 @@ msgstr "Cópia de Segurança / Gravar Firmware"
 msgid "Backup file list"
 msgstr "Lista de arquivos para a cópia de segurança"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Endereço especificado está incorreto!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -885,7 +887,7 @@ msgstr ""
 "de configuração alterados marcados pelo opkg, arquivos base essenciais e "
 "padrões para a cópia de segurança definidos pelo usuário."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -907,7 +909,7 @@ msgstr "Vincule o túnel a esta interface (opcional)."
 msgid "Bitrate"
 msgstr "Taxa de bits"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Substituir Domínio NX Falsos"
 
@@ -1108,10 +1110,11 @@ msgid "Close list..."
 msgstr "Fechar a lista..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Coletando dados..."
 
@@ -1145,7 +1148,6 @@ msgstr ""
 "em ambientes com muito tráfego."
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Configuração"
@@ -1185,7 +1187,7 @@ msgstr "A tentativa de conexão falhou"
 msgid "Connection lost"
 msgstr "Conexão perdida"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Conexões"
 
@@ -1286,8 +1288,8 @@ msgstr "Segredo DAE"
 msgid "DHCP Server"
 msgstr "Servidor DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP e DNS"
 
@@ -1322,7 +1324,7 @@ msgstr "Serviço DHCPv6"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "Encaminhamentos DNS"
 
@@ -1330,11 +1332,11 @@ msgstr "Encaminhamentos DNS"
 msgid "DNS-Label / FQDN"
 msgstr "Rótulo DNS / FQDN"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr "Verificar DNSSEC sem assinatura"
 
@@ -1365,6 +1367,7 @@ msgstr ""
 "Intervalo <abbr title=\"Mensagem Indicativa de Envio de Tráfego/Delivery "
 "Traffic Indication Message\">DTIM</abbr>"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1507,8 +1510,7 @@ msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 "O dispositivo está fora de alcance! Ainda aguardando pelo dispositivo..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Diagnóstico"
 
@@ -1567,7 +1569,7 @@ msgstr "Desabilitado"
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Desassociar quando tiver baixa confirmação de recebimento"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 "Descartar respostas de servidores externos para redes privadas (RFC1918)"
@@ -1602,7 +1604,7 @@ msgstr "Otimização de Distância"
 msgid "Distance to farthest network member in meters."
 msgstr "Distância para o computador mais distante da rede (em metros)."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1614,19 +1616,19 @@ msgstr ""
 "\">DNS</abbr> para firewalls <abbr title=\"Tradução de Endereço de Rede"
 "\">NAT</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 "Não mantenha em cache para respostas negativas como, por exemplo, para os "
 "domínios inexistentes"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Não encaminhe requisições que não podem ser respondidas por servidores de "
 "nomes públicos"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Não encaminhe buscas por endereço reverso das redes local"
 
@@ -1646,11 +1648,11 @@ msgstr "Você realmente deseja apagar todas as configurações?"
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr "Você realmente deseja apagar recursivamente o diretório \"%s\" ?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Requerer domínio"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Lista branca de domínios"
 
@@ -1658,7 +1660,7 @@ msgstr "Lista branca de domínios"
 msgid "Don't Fragment"
 msgstr "Não Fragmentar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1816,7 +1818,7 @@ msgstr "Ativar o cliente <abbr title=\"Network Time Protocol\">NTP</abbr>"
 msgid "Enable Single DES"
 msgstr "Habilitar DES Simples"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Ativar servidor TFTP"
 
@@ -1942,11 +1944,11 @@ msgstr "Adaptador Ethernet"
 msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr "Excluir interfaces"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Expandir arquivos de equipamentos conhecidos (hosts)"
 
@@ -1955,6 +1957,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr "Esperando uma sugestão hexadecimal da atribuição"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr "Esperando: %s"
 
@@ -2038,7 +2047,7 @@ msgstr "Arquivo não associado"
 msgid "Filename"
 msgstr "Nome de arquivo"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "Nome do arquivo da imagem de boot anunciada para os clientes"
 
@@ -2047,11 +2056,11 @@ msgstr "Nome do arquivo da imagem de boot anunciada para os clientes"
 msgid "Filesystem"
 msgstr "Sistema de Arquivos"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Filtrar endereços privados"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Filtrar consultas inúteis"
 
@@ -2077,7 +2086,7 @@ msgstr "Procurar e conectar à rede"
 msgid "Finish"
 msgstr "Terminar"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -2101,7 +2110,7 @@ msgstr "Arquivo da Firmware"
 msgid "Firmware Version"
 msgstr "Versão do Firmware"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Porta de origem fixa para saída de consultas DNS"
 
@@ -2202,8 +2211,8 @@ msgid ""
 "Further information about WireGuard interfaces and peers at <a href='http://"
 "wireguard.com'>wireguard.com</a>."
 msgstr ""
-"Mais informações sobre interfaces WireGuard e parceiros em<a "
-"href='http://wireguard.com'>wireguard.com</a>."
+"Mais informações sobre interfaces WireGuard e parceiros em<a href='http://"
+"wireguard.com'>wireguard.com</a>."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:79
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
@@ -2233,7 +2242,7 @@ msgstr "O endereço do roteador padrão é inválido"
 msgid "Gateway metric"
 msgstr "Métrica de gateway"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2274,9 +2283,9 @@ msgstr "Configurações Globais"
 msgid "Global network options"
 msgstr "Opção global de rede"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Ir para a configuração de senha..."
@@ -2333,6 +2342,7 @@ msgstr ""
 msgid "Hide empty chains"
 msgstr "Ocultar as correntes vazias"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2358,7 +2368,7 @@ msgid "Host-Uniq tag content"
 msgstr "Conteúdo da etiqueta única do equipamento"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2371,7 +2381,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "Nome do equipamento enviado quando requisitar DHCP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Nome dos equipamentos"
 
@@ -2411,13 +2421,13 @@ msgstr "O endereço IP é inválido"
 msgid "IP address is missing"
 msgstr "O endereço IP está ausente"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2485,6 +2495,8 @@ msgstr "IPv4 e IPv4 (RFC2003)"
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr "IPv4/IPv6 (ambos - padrão é IPv4)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2495,8 +2507,6 @@ msgstr "IPv4/IPv6 (ambos - padrão é IPv4)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2568,6 +2578,7 @@ msgstr "Prefixo roteável IPv6"
 msgid "IPv6 suffix"
 msgstr "Sufixo IPv6"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2671,7 +2682,7 @@ msgstr ""
 "de transferência tão altas com a memória <abbr title=\"Memória de Acesso "
 "Aleatório\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorar <code>/etc/hosts</code>"
 
@@ -2679,7 +2690,7 @@ msgstr "Ignorar <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Ignorar interface"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Ignorar o arquivo de resolução de nomes (resolv.conf)"
 
@@ -2733,10 +2744,6 @@ msgstr "Script de iniciação"
 msgid "Initscripts"
 msgstr "Scripts de iniciação"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr "Instale iputils-traceroute6 para rastrear rotas IPv6"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Instalar extensões de protocolo..."
@@ -2798,7 +2805,7 @@ msgstr "A interface não está presente ou não está conectada ainda."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Interfaces"
 
@@ -2859,9 +2866,9 @@ msgstr ""
 "A imagem que está a tentar carregar aparenta nao caber na flash do "
 "equipamento. Por favor verifique o arquivo da imagem!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "É necessário JavaScript!"
@@ -2882,8 +2889,8 @@ msgstr "Juntando-se à rede %q"
 msgid "Keep settings and retain the current configuration"
 msgstr "Manter as configurações e manter a configuração atual"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Registro do Kernel"
 
@@ -2959,16 +2966,17 @@ msgstr "Latência"
 msgid "Leaf"
 msgstr "Folha"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "Tempo de concessão"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Arquivo de atribuições"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2995,13 +3003,13 @@ msgstr "Legenda:"
 msgid "Limit"
 msgstr "Limite"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 "Limite o serviço DNS para subredes das interfaces nas quais estamos servindo "
 "DNS."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "Escute somente nestas interfaces e na interface local (loopback)."
 
@@ -3025,7 +3033,7 @@ msgstr "Tempo de Atividade da Linha"
 msgid "Link On"
 msgstr "Enlace Ativo"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -3065,19 +3073,19 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr "Lista de arquivos de chaves SSH para autenticação"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 "Lista dos domínios para os quais será permitido respostas apontando para "
 "redes privadas (RFC1918)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 "Lista de servidores <abbr title=\"Domain Name System\">DNS</abbr> que "
 "fornecem resultados errados para consultas a domínios inexistentes (NX)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr "Interfaces de Escuta"
 
@@ -3090,12 +3098,12 @@ msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 "Escuta apenas na interface especificada. Se não especificado, escuta em todas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Porta de escuta para a entrada das consultas DNS"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Carga"
 
@@ -3103,10 +3111,6 @@ msgstr "Carga"
 msgid "Load Average"
 msgstr "Carga Média"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Carregando"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr "Carregando conteúdo do diretório…"
@@ -3139,7 +3143,7 @@ msgstr "Endereço IPv4 local"
 msgid "Local IPv6 address"
 msgstr "Endereço IPv6 local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr "Somente Serviço Local"
 
@@ -3152,11 +3156,11 @@ msgstr "Iniciação Local"
 msgid "Local Time"
 msgstr "Hora Local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Domínio Local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3165,17 +3169,17 @@ msgstr ""
 "encaminhados e são resolvidos somente pelo DHCP ou pelo arquivos de "
 "equipamentos conhecidos (hosts)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 "Sufixo do domínio local adicionado aos nomes no DHCP e nas entradas dos "
 "arquivo de equipamentos conhecidos (hosts)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Servidor Local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3183,7 +3187,7 @@ msgstr ""
 "Localizar o nome do equipamento dependendo da subrede requisitante se "
 "mútliplos endereços IPs estiverem disponíveis"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Localizar consultas"
 
@@ -3191,7 +3195,7 @@ msgstr "Localizar consultas"
 msgid "Log output level"
 msgstr "Nível de detalhamento de saída dos registros"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Registar as consultas"
 
@@ -3203,7 +3207,7 @@ msgstr "Registrando os eventos"
 msgid "Login"
 msgstr "Entrar"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Sair"
 
@@ -3306,15 +3310,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr "Intervalo máximo permitido de escuta"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Número máximo permitido de alocações DHCP ativas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Número máximo permitido de consultas DNS concorrentes"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Tamanho máximo permitido dos pacotes UDP EDNS.0"
 
@@ -3454,6 +3458,7 @@ msgstr "Ponto de Montagem"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Pontos de Montagem"
 
@@ -3547,11 +3552,10 @@ msgstr "Nome"
 msgid "Name of the new network"
 msgstr "Nome da nova rede"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navegação"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3559,14 +3563,15 @@ msgstr "Navegação"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Rede"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Utilitários de Rede"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Imagem de boot pela rede"
 
@@ -3624,13 +3629,13 @@ msgstr "Nenhuma informação disponível"
 msgid "No matching prefix delegation"
 msgstr "Não casou com nenhum prefixo delegado"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Nenhum cache negativo"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Nenhuma senha definida!"
@@ -3680,7 +3685,7 @@ msgstr ""
 "Erros CRC Não Preemptivos<abbr title=\"Non Pre-emptive CRC errors\">CRC_P</"
 "abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr "Sem caracter curinga"
 
@@ -3722,11 +3727,11 @@ msgstr "Sem suporte"
 msgid "Notice"
 msgstr "Aviso"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr "Número de entradas DNS em cache (máximo é 10000, 0 desabilita o cache)"
 
@@ -3773,7 +3778,7 @@ msgstr "Rota em enlace"
 msgid "On-State Delay"
 msgstr "Atraso no estado de conexões"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 "É necessário especificar ao menos um nome de equipamento ou endereço MAC!"
@@ -3967,7 +3972,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr "Sobrescrever a tabela usada para as rotas internas"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Visão Geral"
 
@@ -4195,8 +4200,9 @@ msgstr "Taxa física:"
 msgid "Physical Settings"
 msgstr "Configurações Físicas"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ping"
 
@@ -4275,7 +4281,7 @@ msgstr ""
 "Assumir que o parceiro está morto depois de uma data quantidade de falhas de "
 "echo do LCP. Use 0 para ignorar as falhas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr "Evite escutar nestas Interfaces."
 
@@ -4288,7 +4294,7 @@ msgid "Private Key"
 msgstr "Chave Privada"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Processos"
 
@@ -4351,13 +4357,13 @@ msgstr "Celular QMI"
 msgid "Quality"
 msgstr "Qualidade"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
-"Consultar todos os servidores de <abbr title=\"Domain Name System\""
-">DNS</abbr> disponíveis"
+"Consultar todos os servidores de <abbr title=\"Domain Name System\">DNS</"
+"abbr> disponíveis"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1395
 msgid "R0 Key Lifetime"
@@ -4422,7 +4428,7 @@ msgstr ""
 "Bytes brutos codificados em hexadecimal. Deixe vazio a não ser que seu "
 "provedor requeira isso"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4434,7 +4440,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "Realmente trocar o protocolo?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Gráficos em Tempo Real"
 
@@ -4442,12 +4448,13 @@ msgstr "Gráficos em Tempo Real"
 msgid "Reassociation Deadline"
 msgstr "Limite para Reassociação"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "Proteção contra \"Rebind\""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reiniciar"
 
@@ -4581,7 +4588,7 @@ msgstr ""
 "Requer a versão 'completa' do wpad/hostapd e suporte do driver wifi <br />(a "
 "partir de Jan 2019: ath9k, ath10k, mwlwifi e mt76)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4629,11 +4636,11 @@ msgstr "Reiniciar os Contadores"
 msgid "Reset to defaults"
 msgstr "Redefinir para os valores padrão"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Arquivos Resolv e Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Arquivo Resolv"
 
@@ -4686,7 +4693,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr "Revertendo configurações…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Diretório raiz para arquivos disponibilizados pelo TFTP"
 
@@ -4712,12 +4719,13 @@ msgstr "Serviço de Anúncio de Roteador"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Senha do Roteador"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Rotas"
 
@@ -4756,6 +4764,7 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Acesso SSH"
 
@@ -4773,6 +4782,7 @@ msgstr "Usuário do SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Chaves SSH"
 
@@ -4817,6 +4827,7 @@ msgstr "Procurar"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Tarefas Agendadas"
 
@@ -4861,7 +4872,7 @@ msgstr ""
 "Enviar requisições de eco do LCP no dado intervalo em segundos. Somente "
 "efetivo em conjunto com o limite de falhas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Configurações do Servidor"
 
@@ -4874,7 +4885,7 @@ msgstr "Nome do Serviço"
 msgid "Service Type"
 msgstr "Tipo do Serviço"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Serviços"
 
@@ -4972,7 +4983,7 @@ msgstr "Sinal:"
 msgid "Size"
 msgstr "Tamanho"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr "Tamanho do cache de consultas DNS"
 
@@ -4985,11 +4996,11 @@ msgstr "Tamanho do dispositivo ZRam em megabytes"
 msgid "Skip"
 msgstr "Pular"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Pular para o conteúdo"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Pular para a navegação"
 
@@ -5104,6 +5115,7 @@ msgstr "Iniciando o escaneamento da rede sem fio..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Iniciação"
 
@@ -5115,11 +5127,11 @@ msgstr "Rotas Estáticas IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Rotas Estáticas IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Alocações Estáticas"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Rotas Estáticas"
 
@@ -5129,7 +5141,7 @@ msgstr "Rotas Estáticas"
 msgid "Static address"
 msgstr "Endereço Estático"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -5144,10 +5156,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr "Limite de inatividade da estação"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Condição"
 
@@ -5157,7 +5169,7 @@ msgstr "Condição"
 msgid "Stop"
 msgstr "Parar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Ordem Exata"
 
@@ -5170,11 +5182,11 @@ msgstr "Forte"
 msgid "Submit"
 msgstr "Enviar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr "Suprimir registros (log)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Suprimir registros (log) de operações rotineiras destes protocolos"
 
@@ -5183,7 +5195,7 @@ msgid "Swap free"
 msgstr "Swap livre"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Switch"
 
@@ -5233,15 +5245,16 @@ msgstr "Sincronizar com o Servidor NTP"
 msgid "Sync with browser"
 msgstr "Sincronizar com o navegador"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistema"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Registro do Sistema"
 
@@ -5257,11 +5270,11 @@ msgstr "Tamanho do buffer de registro do sistema"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Configurações do TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "Raiz do servidor TFTP"
 
@@ -5438,10 +5451,10 @@ msgid ""
 msgstr ""
 "As portas de rede neste dispositivo podem ser configuradas em diversas <abbr "
 "title=\"Virtual Local Area Network\">VLAN</abbr>s nas quais computadores "
-"podem se comunicar diretamente. <abbr title=\"Virtual Local Area Network\""
-">VLAN</abbr>s são muitas vezes utilizadas para separar diferentes segmentos "
-"de rede. Em geral, existe uma porta para o enlace superior (uplink) e as "
-"demais portas são utilizadas para a rede local."
+"podem se comunicar diretamente. <abbr title=\"Virtual Local Area Network"
+"\">VLAN</abbr>s são muitas vezes utilizadas para separar diferentes "
+"segmentos de rede. Em geral, existe uma porta para o enlace superior "
+"(uplink) e as demais portas são utilizadas para a rede local."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:154
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:35
@@ -5523,7 +5536,8 @@ msgstr ""
 "A imagem carregada não contém um formato suportado. Confirme que você "
 "escolheu uma imagem para a sua plataforma."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5533,9 +5547,9 @@ msgstr "Não há concessões de IP ativas no momento"
 msgid "There are no changes to apply"
 msgstr "Não há alterações a serem aplicadas"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5556,15 +5570,15 @@ msgstr "Este tipo de autenticação não é aplicável ao método EAP selecionad
 msgid "This does not look like a valid PEM file"
 msgstr "Isso não se parece com um arquivo PEM válido"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
 "Name System\">DNS</abbr> servers."
 msgstr ""
-"Este arquivo pode conter linhas como 'server=/domain/1.2.3.4' ou 'server="
-"1.2.3.4' para servidores específicos ou completos de domínio <abbr title=\""
-"Domain Name System\">DNS</abbr> servidores."
+"Este arquivo pode conter linhas como 'server=/domain/1.2.3.4' ou "
+"'server=1.2.3.4' para servidores específicos ou completos de domínio <abbr "
+"title=\"Domain Name System\">DNS</abbr> servidores."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:16
@@ -5603,7 +5617,7 @@ msgstr ""
 "Este é o endereço da ponta local designado pelo agente de túnel. normalmente "
 "ele termina com <code>...:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5682,14 +5696,15 @@ msgstr "Tom"
 msgid "Total Available"
 msgstr "Total Disponível"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Traceroute"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Tráfego"
 
@@ -5926,7 +5941,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Tempo de atividade"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Usar <code>/etc/ethers</code>"
 
@@ -6039,7 +6054,7 @@ msgstr "Use a métrica do roteador"
 msgid "Use routing table"
 msgstr "Use a tabela de roteamento"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -6048,8 +6063,8 @@ msgid ""
 "standard host-specific lease time, e.g. 12h, 3d or infinite."
 msgstr ""
 "Use o botão <em>Adicionar</em> para adicionar uma nova entrada de alocação. "
-"O endereço <em>MAC-Address</em> identifica o equipamento, o endereço <em>"
-"Endereço IPv4</em> especifica o endereço fixo para usar e o <em>Nome do "
+"O endereço <em>MAC-Address</em> identifica o equipamento, o endereço "
+"<em>Endereço IPv4</em> especifica o endereço fixo para usar e o <em>Nome do "
 "equipamento</em> é designado como nome simbólico (DNS) para o equipamento "
 "requisitante. O <em>Tempo de concessão</em> opcional pode ser usado para "
 "definir tempos de concessão específico por host, ex., 12h, 3d ou infinito."
@@ -6096,7 +6111,7 @@ msgstr "VDSL"
 msgid "VLANs on %q"
 msgstr "VLANs em %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr "VPN"
 
@@ -6176,10 +6191,6 @@ msgstr ""
 "A cifragem WPA requer a instalação do wpa_supplicant (para modo cliente) ou "
 "do hostapd (para modo AP ou ad-hoc)."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "Aguardando a conclusão do comando..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "Esperando pelo dispositivo..."
@@ -6217,9 +6228,9 @@ msgstr "Largura"
 msgid "WireGuard VPN"
 msgstr "VPN WireGuard"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Rede sem fio"
 
@@ -6267,7 +6278,7 @@ msgstr "A rede sem fio está desabilitada"
 msgid "Wireless network is enabled"
 msgstr "A rede sem fio está habilitada"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Escreva as requisições DNS para o servidor de registro (syslog)"
 
@@ -6285,8 +6296,8 @@ msgid ""
 "You appear to be currently connected to the device via the \"%h\" interface. "
 "Do you really want to shut down the interface?"
 msgstr ""
-"Você parece estar atualmente conectado ao aparelho através da interface \"%"
-"h\". Você quer realmente desligar a interface?"
+"Você parece estar atualmente conectado ao aparelho através da interface \"%h"
+"\". Você quer realmente desligar a interface?"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:109
 msgid ""
@@ -6300,9 +6311,9 @@ msgstr ""
 "como por exemplo \"rede/network\", o dispositivo poderá tornar-se "
 "inacessível!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6326,7 +6337,7 @@ msgstr "Configurações ZRam"
 msgid "ZRam Size"
 msgstr "Tamanho ZRam"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "qualquer"
 
@@ -6415,13 +6426,14 @@ msgstr "desabilitado"
 msgid "driver default"
 msgstr "padrão do driver"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "expirado"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6475,7 +6487,7 @@ msgstr "chave entre 8 e 63 caracteres"
 msgid "key with either 5 or 13 characters"
 msgstr "chave com 5 ou 13 caracteres"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 "arquivo local de <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
@@ -6514,16 +6526,16 @@ msgstr "não presente"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "desligado"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "ligado"
@@ -6601,8 +6613,9 @@ msgstr "valor único"
 msgid "unknown"
 msgstr "desconhecido"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6630,6 +6643,7 @@ msgid "untagged"
 msgstr "não etiquetado"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr "endereço IP válido"
 
@@ -6642,6 +6656,7 @@ msgid "valid IPv4 CIDR"
 msgstr "CIDR IPv4 válido"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr "endereço IPv4 válido"
 
@@ -6670,6 +6685,7 @@ msgid "valid IPv6 CIDR"
 msgstr "CIDR IPv6 válido"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr "endereço IPv6 válido"
 
@@ -6729,6 +6745,9 @@ msgstr "host:porta válida"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr "nome de host válido"
 
@@ -6754,6 +6773,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr "Porta ou intervalo de portas válida (port1-port2)"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr "valor de porta válida"
 
@@ -6801,6 +6821,18 @@ msgstr "sim"
 msgid "« Back"
 msgstr "« Voltar"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Endereço especificado está incorreto!"
+
+#~ msgid "Install iputils-traceroute6 for IPv6 traceroute"
+#~ msgstr "Instale iputils-traceroute6 para rastrear rotas IPv6"
+
+#~ msgid "Loading"
+#~ msgstr "Carregando"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "Aguardando a conclusão do comando..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Atribuir as interfaces..."
 
diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po
index 377dd9167..4bcbf25d4 100644
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -43,6 +43,8 @@ msgstr "(janela de %d minutos, intervalo de %d segundos)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -152,17 +154,17 @@ msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 "<abbr title=\"Identificador de Conjunto Básico de Serviços\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 "Porta de consulta do <abbr title=\"Servidor de Nomes de Domínio\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr ""
 "Porta do servidor <abbr title=\"Servidor de Nomes de Domínio\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -175,7 +177,7 @@ msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "<abbr title=\"Identificador de Conjunto de Serviços Estendidos\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Endereço <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
@@ -203,13 +205,14 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Gateway <abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 "Sufixo (hex) <abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr>"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuração do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
@@ -217,16 +220,16 @@ msgstr "Configuração do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Nome do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Endereço <abbr title=\"Controle de Acesso ao Meio\">MAC</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr "<abbr title=\"Identificador Único do DHCP\">DUID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -234,7 +237,7 @@ msgstr ""
 "<abbr title=\"Máximo\">Max.</abbr> de concessões<abbr title=\"Protocolo de "
 "Configuracao Dinamica de Hosts\">DHCP</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -242,7 +245,7 @@ msgstr ""
 "Tamanho <abbr title=\"Máximo\">max.</abbr> do pacote <abbr title="
 "\"Mecanismos de Extensão para Sistemas de Nomes de Domínio\">EDNS0</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"máximo\">Max.</abbr> de consultas concorrentes"
 
@@ -365,6 +368,7 @@ msgstr "Ligações Ativas"
 msgid "Active DHCP Leases"
 msgstr "Concessões DHCP Ativas"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Concessões DHCPv6 Ativas"
@@ -420,7 +424,7 @@ msgstr "Adicionar instância"
 msgid "Add key"
 msgstr "Adicionar chave"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "Adicionar um sufixo de domínio local aos nomes servidos dos ficheiros hosts"
@@ -434,11 +438,11 @@ msgstr "Adicionar uma nova interface..."
 msgid "Add peer"
 msgstr "Adicionar par"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Ficheiro Hosts adicional"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "Ficheiro servers adicional"
 
@@ -459,12 +463,13 @@ msgstr "Endereço"
 msgid "Address to access local relay bridge"
 msgstr "Endereço para acesso à ponte de retransmissão local"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Gestão"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -495,11 +500,11 @@ msgstr "Interface Adicional"
 msgid "Alias of \"%s\""
 msgstr "Interface adicional de \"%s\""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr "Todos os Servidores"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
@@ -507,7 +512,7 @@ msgstr ""
 "Alocar endereços IP sequencialmente, a começar pelo endereço mais baixo "
 "disponível"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr "Alocar endereços IP sequencialmente"
 
@@ -533,7 +538,7 @@ msgstr "Permitir taxas antigas 802.11b"
 msgid "Allow listed only"
 msgstr "Permitir somente os listados"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Permitir localhost"
 
@@ -550,7 +555,7 @@ msgstr "Permitir o login como root com password"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Permitir que o utilizador <em>root</em> faça login com password"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -730,7 +735,7 @@ msgstr "Autenticação"
 msgid "Authentication Type"
 msgstr "Tipo de Autenticação"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Autoritário"
 
@@ -738,11 +743,11 @@ msgstr "Autoritário"
 msgid "Authorization Required"
 msgstr "Autorização Requerida"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -840,6 +845,7 @@ msgid "Backup"
 msgstr "Backup"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Backup / Flash Firmware"
 
@@ -848,10 +854,6 @@ msgstr "Backup / Flash Firmware"
 msgid "Backup file list"
 msgstr "Lista de ficheiros para backup"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Endereço incorreto especificado!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -872,7 +874,7 @@ msgstr ""
 "configuração alterados e marcados pelo opkg, ficheiros base essenciais e "
 "padrões de backup definidos pelo utilizador."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -894,7 +896,7 @@ msgstr "Ligar o túnel a esta interface (opcional)."
 msgid "Bitrate"
 msgstr "Taxa de bits"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Substituir Domínios NX Falsos"
 
@@ -1093,10 +1095,11 @@ msgid "Close list..."
 msgstr "Fechar lista..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "A recolher dados..."
 
@@ -1130,7 +1133,6 @@ msgstr ""
 "tráfego."
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Configuração"
@@ -1170,7 +1172,7 @@ msgstr "A tentativa de ligação falhou"
 msgid "Connection lost"
 msgstr "Ligação perdida"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Ligações"
 
@@ -1271,8 +1273,8 @@ msgstr "Segredo DAE"
 msgid "DHCP Server"
 msgstr "Servidor DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP e DNS"
 
@@ -1307,7 +1309,7 @@ msgstr "Serviço DHCPv6"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "Encaminhamentos DNS"
 
@@ -1315,11 +1317,11 @@ msgstr "Encaminhamentos DNS"
 msgid "DNS-Label / FQDN"
 msgstr "Rótulo DNS / FQDN"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr "Verificar DNSSEC sem assinatura"
 
@@ -1348,6 +1350,7 @@ msgstr "Modo de linha DSL"
 msgid "DTIM Interval"
 msgstr "Intervalo DTIM"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1489,8 +1492,7 @@ msgstr "Aparelho não alcançável!"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "O aparelho está fora de alcance! Ainda à espera do aparelho..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Diagnósticos"
 
@@ -1549,7 +1551,7 @@ msgstr "Desativado"
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Desassociar quando tiver baixa confirmação"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Descartar respostas RFC1918 a montante"
 
@@ -1583,7 +1585,7 @@ msgstr "Otimização de Distância"
 msgid "Distance to farthest network member in meters."
 msgstr "Distância para o host da rede mais distante em metros."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1595,17 +1597,17 @@ msgstr ""
 "\">DNS</abbr> para firewalls <abbr title=\"Network Address Translation"
 "\">NAT</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr "Não por respostas negativas em cache, p.e. para domínios inexistentes"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Não encaminhar pedidos que não possam ser respondidos por servidores de "
 "nomes públicos"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Não encaminhar lookups reversos para as redes locais"
 
@@ -1625,11 +1627,11 @@ msgstr "Quer mesmo apagar todas as configurações?"
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr "Deseja mesmo apagar recursivamente o diretório \"%s\"?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Domínio requerido"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Lista Branca do Domínio"
 
@@ -1637,7 +1639,7 @@ msgstr "Lista Branca do Domínio"
 msgid "Don't Fragment"
 msgstr "Não Fragmentar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1791,7 +1793,7 @@ msgstr "Ativar o cliente NTP"
 msgid "Enable Single DES"
 msgstr "Ativar DES Único"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Ativar o servidor TFTP"
 
@@ -1915,11 +1917,11 @@ msgstr "Adaptador Ethernet"
 msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr "Excluir interfaces"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Expandir hosts"
 
@@ -1928,6 +1930,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr "À espera de uma dica de atribuição hexadecimal"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr "À espera de: %s"
 
@@ -2007,7 +2016,7 @@ msgstr "Ficheiro não acessível"
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "Nome de ficheiro da imagem de boot a anunciar aos clientes"
 
@@ -2016,11 +2025,11 @@ msgstr "Nome de ficheiro da imagem de boot a anunciar aos clientes"
 msgid "Filesystem"
 msgstr "Sistema de ficheiros"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Filtrar endereços privados"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Filtrar inúteis"
 
@@ -2045,7 +2054,7 @@ msgstr "Procurar e ligar a uma rede"
 msgid "Finish"
 msgstr "Terminar"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -2069,7 +2078,7 @@ msgstr "Ficheiro de Firmware"
 msgid "Firmware Version"
 msgstr "Versão do Firmware"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Porta fixa de origem para saída dos pedidos DNS"
 
@@ -2201,7 +2210,7 @@ msgstr "O endereço do gateway é inválido"
 msgid "Gateway metric"
 msgstr "Métrica de Gateway"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2241,9 +2250,9 @@ msgstr "Configurações Globais"
 msgid "Global network options"
 msgstr "Opções de rede globais"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Ir para a configuração da palavra-passe…"
@@ -2300,6 +2309,7 @@ msgstr ""
 msgid "Hide empty chains"
 msgstr "Esconder cadeias vazias"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2323,7 +2333,7 @@ msgid "Host-Uniq tag content"
 msgstr "Conteúdo da etiqueta Host-Uniq"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2336,7 +2346,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "Nome do Host a enviar quando houver um pedido DHCP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Endereços de Hosts"
 
@@ -2374,13 +2384,13 @@ msgstr "O endereço IP é inválido"
 msgid "IP address is missing"
 msgstr "O endereço IP está ausente"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2448,6 +2458,8 @@ msgstr "IPv4-in-IPv4 (RFC2003)"
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr "IPv4/IPv6 (ambos - padrão é IPv4)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2458,8 +2470,6 @@ msgstr "IPv4/IPv6 (ambos - padrão é IPv4)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2529,6 +2539,7 @@ msgstr "Prefixo roteado IPv6"
 msgid "IPv6 suffix"
 msgstr "Sufixo IPv6"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2630,7 +2641,7 @@ msgstr ""
 "lento, pois o aparelho swap não pode ser acedido com a alta taxa de dados da "
 "memória <abbr title=\"Random Access Memory\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorar <code>/etc/hosts</code>"
 
@@ -2638,7 +2649,7 @@ msgstr "Ignorar <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Ignorar interface"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Ignorar o ficheiro resolv.conf"
 
@@ -2692,10 +2703,6 @@ msgstr "Script de arranque"
 msgid "Initscripts"
 msgstr "Scripts de arranque"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr "Instale o iputils-traceroute6 para ver o rasto das rotas IPv6"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Instalar extensões do protocolo..."
@@ -2757,7 +2764,7 @@ msgstr "Interface não presente ou ainda não ligada."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Interfaces"
 
@@ -2815,9 +2822,9 @@ msgstr ""
 "A imagem que está a tentar carregar aparenta não caber na flash do "
 "equipamento, por favor verifique o ficheiro da imagem!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "É necessário JavaScript!"
@@ -2838,8 +2845,8 @@ msgstr "A associar à rede: %q"
 msgid "Keep settings and retain the current configuration"
 msgstr "Manter as definições e manter a configuração atual"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Logs da Kernel"
 
@@ -2915,16 +2922,17 @@ msgstr "Latência"
 msgid "Leaf"
 msgstr "Folha"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "Tempo de concessão"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Ficheiro de concessões"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2951,13 +2959,13 @@ msgstr "Legenda:"
 msgid "Limit"
 msgstr "Limite"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 "Limitar o serviço DNS para subredes das interfaces nas quais está a ser "
 "servido DNS."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "Escutar apenas nestas interfaces, e na loopback."
 
@@ -2981,7 +2989,7 @@ msgstr "Tempo de Ativo da Linha"
 msgid "Link On"
 msgstr "Link Ativo"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -3021,17 +3029,17 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr "Lista de ficheiros de chaves SSH para autenticação"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Lista de dominios que permitem respostas RFC1918 para"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 "Lista de servidores <abbr title=\"Domain Name System\">DNS</abbr> que "
 "fornecem resultados errados para consultas a domínios inexistentes (NX)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr "Interfaces de Escuta"
 
@@ -3044,12 +3052,12 @@ msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 "Escutar apenas na interface fornecida ou, se não especificada, em todas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Porta de escuta para entrada de consultas DNS"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Carregar"
 
@@ -3057,10 +3065,6 @@ msgstr "Carregar"
 msgid "Load Average"
 msgstr "Carga Média"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "A carregar"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr "Carregando o conteúdo do diretório…"
@@ -3093,7 +3097,7 @@ msgstr "Endereço IPv4 Local"
 msgid "Local IPv6 address"
 msgstr "Endereço IPv6 Local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr "Somente Serviço Local"
 
@@ -3106,11 +3110,11 @@ msgstr "Arranque Local"
 msgid "Local Time"
 msgstr "Hora Local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Domínio local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3119,17 +3123,17 @@ msgstr ""
 "nunca serão encaminhados e são resolvidos somente pelo DHCP ou pelo "
 "ficheiros de equipamentos conhecidos (hosts)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 "Sufixos de dominio local a juntar aos nomes DHCP e às entradas do ficheiro "
 "de hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Servidor local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3137,7 +3141,7 @@ msgstr ""
 "Localizar o nome do equipamento dependendo da subrede requisitante se "
 "mútliplos endereços IPs estiverem disponíveis"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Localizar consultas"
 
@@ -3145,7 +3149,7 @@ msgstr "Localizar consultas"
 msgid "Log output level"
 msgstr "Nível de output do log"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Registo das consultas"
 
@@ -3157,7 +3161,7 @@ msgstr "Logging"
 msgid "Login"
 msgstr "Login"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Sair"
 
@@ -3260,15 +3264,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr "Intervalo de Escuta máximo permitido"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Quantidade máxima permitida de concessões DHCP ativas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Quantidade máxima permitida de consultas DNS permitidas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Tamanho máximo permitido dos pacotes UDP EDNS.0"
 
@@ -3409,6 +3413,7 @@ msgstr "Ponto de Montagem"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Pontos de Montagem"
 
@@ -3502,11 +3507,10 @@ msgstr "Nome"
 msgid "Name of the new network"
 msgstr "Nome da nova rede"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navegação"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3514,14 +3518,15 @@ msgstr "Navegação"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Rede"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Ferramentas de Rede"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Imagem de arranque via rede"
 
@@ -3579,13 +3584,13 @@ msgstr "Sem informação disponível"
 msgid "No matching prefix delegation"
 msgstr "Não casou com nenhum prefixo delegado"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Sem cache negativa"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Sem password definida!"
@@ -3635,7 +3640,7 @@ msgstr ""
 "Erros CRC Não Preemptivos<abbr title=\"Non Pre-emptive CRC errors\">CRC_P</"
 "abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr "Sem caracter curinga"
 
@@ -3677,11 +3682,11 @@ msgstr "Não suportado"
 msgid "Notice"
 msgstr "Aviso"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 "Quantidade de entradas DNS em cache (máximo é 10000, 0 desativa o cache)"
@@ -3729,7 +3734,7 @@ msgstr "Rota On-Link"
 msgid "On-State Delay"
 msgstr "Atraso do On-State"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "Um nome de host ou endereço MAC deve ser especificado!"
 
@@ -3922,7 +3927,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr "Sobrescrever a tabela usada para as rotas internas"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Visão Geral"
 
@@ -4150,8 +4155,9 @@ msgstr "Taxa física:"
 msgid "Physical Settings"
 msgstr "Definições Físicas"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ping"
 
@@ -4230,7 +4236,7 @@ msgstr ""
 "Assumir que o parceiro está morto depois de uma data quantidade de falhas de "
 "echo do LCP. Use 0 para ignorar as falhas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr "Evite escutar nestas Interfaces."
 
@@ -4243,7 +4249,7 @@ msgid "Private Key"
 msgstr "Chave Privada"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Processos"
 
@@ -4305,7 +4311,7 @@ msgstr "Celular QMI"
 msgid "Quality"
 msgstr "Qualidade"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4376,7 +4382,7 @@ msgstr ""
 "Bytes brutos codificados em hexadecimal. Deixe vazio a não ser que seu "
 "provedor requeira isso"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4388,7 +4394,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "Deseja mesmo trocar o protocolo?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Gráficos em Tempo Real"
 
@@ -4396,12 +4402,13 @@ msgstr "Gráficos em Tempo Real"
 msgid "Reassociation Deadline"
 msgstr "Limite para Reassociação"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "Religar protecção"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reiniciar"
 
@@ -4534,7 +4541,7 @@ msgstr ""
 "Requer a versão 'completa' do wpad/hostapd e suporte do driver wifi <br />(a "
 "partir de Jan 2019: ath9k, ath10k, mwlwifi e mt76)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4582,11 +4589,11 @@ msgstr "Limpar contadores"
 msgid "Reset to defaults"
 msgstr "Redefinir para os valores padrão"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Ficheiros Resolv e Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Resolver ficheiro"
 
@@ -4639,7 +4646,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr "Revertendo configurações…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Diretório raiz para ficheiros disponibilizados pelo TFTP"
 
@@ -4665,12 +4672,13 @@ msgstr "Serviço de Anúncio de Roteador"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Password do Router"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Rotas"
 
@@ -4709,6 +4717,7 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Acesso SSH"
 
@@ -4726,6 +4735,7 @@ msgstr "Utilizador do SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Chaves-SSH"
 
@@ -4770,6 +4780,7 @@ msgstr "Procurar"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Tarefas Agendadas"
 
@@ -4814,7 +4825,7 @@ msgstr ""
 "Enviar requisições de eco do LCP no dado intervalo em segundos. Somente "
 "efetivo em conjunto com o limite de falhas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Configurações do Servidor"
 
@@ -4827,7 +4838,7 @@ msgstr "Nome do Serviço"
 msgid "Service Type"
 msgstr "Tipo de Serviço"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Serviços"
 
@@ -4925,7 +4936,7 @@ msgstr "Sinal:"
 msgid "Size"
 msgstr "Tamanho"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr "Tamanho do cache de consultas DNS"
 
@@ -4938,11 +4949,11 @@ msgstr "Tamanho do aparelho ZRam em megabytes"
 msgid "Skip"
 msgstr "Saltar"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Ir para o conteúdo"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Ir para a navegação"
 
@@ -5057,6 +5068,7 @@ msgstr "Iniciando a varredura da rede wireless..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Iniciação"
 
@@ -5068,11 +5080,11 @@ msgstr "Rotas Estáticas IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Rotas Estáticas IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Atribuições Estáticas"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Rotas Estáticas"
 
@@ -5082,7 +5094,7 @@ msgstr "Rotas Estáticas"
 msgid "Static address"
 msgstr "Endereço estático"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -5097,10 +5109,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr "Limite de inatividade da estação"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Estado"
 
@@ -5110,7 +5122,7 @@ msgstr "Estado"
 msgid "Stop"
 msgstr "Parar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Ordem exacta"
 
@@ -5123,11 +5135,11 @@ msgstr "Forte"
 msgid "Submit"
 msgstr "Enviar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr "Suprimir registros (log)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Suprimir registros (log) de operações rotineiras destes protocolos"
 
@@ -5136,7 +5148,7 @@ msgid "Swap free"
 msgstr "Swap livre"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Mudar"
 
@@ -5186,15 +5198,16 @@ msgstr "Sincronizar com o servidor NTP"
 msgid "Sync with browser"
 msgstr "Sincronizar com o browser"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistema"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Registo do Sistema"
 
@@ -5210,11 +5223,11 @@ msgstr "Tamanho do buffer de registro do sistema"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Definições TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "Raíz do servidor TFTP"
 
@@ -5457,8 +5470,8 @@ msgid ""
 "\"Cancel\" to abort the operation."
 msgstr ""
 "O arquivo de backup enviado parece ser válido e contém os ficheiros listados "
-"abaixo. Pressione \"Continuar\" para restaurar o backup e reiniciar, ou \""
-"Cancelar\" para cancelar a operação."
+"abaixo. Pressione \"Continuar\" para restaurar o backup e reiniciar, ou "
+"\"Cancelar\" para cancelar a operação."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:111
 msgid "The uploaded backup archive is not readable"
@@ -5476,7 +5489,8 @@ msgstr ""
 "A imagem carregada não contém um formato suportado. Confirme que escolhe uma "
 "imagem genérica para a sua plataforma."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5486,9 +5500,9 @@ msgstr "Não há arrendamentos ativos"
 msgid "There are no changes to apply"
 msgstr "Não há alterações a serem aplicadas"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5509,15 +5523,15 @@ msgstr "Este tipo de autenticação não é aplicável ao método EAP selecionad
 msgid "This does not look like a valid PEM file"
 msgstr "Isto não parece ser um ficheiro PEM válido"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
 "Name System\">DNS</abbr> servers."
 msgstr ""
-"Este ficheiro pode conter linhas como 'server=/domain/1.2.3.4' ou 'server="
-"1.2.3.4' para domínios específicos ou servidores <abbr title=\"Domain Name "
-"System\">DNS</abbr> completamente upstream."
+"Este ficheiro pode conter linhas como 'server=/domain/1.2.3.4' ou "
+"'server=1.2.3.4' para domínios específicos ou servidores <abbr title="
+"\"Domain Name System\">DNS</abbr> completamente upstream."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:16
@@ -5555,7 +5569,7 @@ msgstr ""
 "Este é o endereço da ponta local designado pelo agente de túnel. normalmente "
 "ele termina com <code>...:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5633,14 +5647,15 @@ msgstr "Tom"
 msgid "Total Available"
 msgstr "Total Disponível"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Traceroute"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Tráfego"
 
@@ -5877,7 +5892,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Uptime"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Usar <code>/etc/ethers</code>"
 
@@ -5990,7 +6005,7 @@ msgstr "Use a métrica do roteador"
 msgid "Use routing table"
 msgstr "Usar tabela de roteamento"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -6047,7 +6062,7 @@ msgstr "VDSL"
 msgid "VLANs on %q"
 msgstr "VLANs em %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr "VPN"
 
@@ -6127,10 +6142,6 @@ msgstr ""
 "A encriptação-WPA necessita do wpa_supplicant (para modo cliente) ou do "
 "hostapd (para modo AP ou ah-hoc) esteja instalado."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "A aguardar que o comando termine..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "Esperando pelo aparelho..."
@@ -6169,9 +6180,9 @@ msgstr "Largura"
 msgid "WireGuard VPN"
 msgstr "VPN WireGuard"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Wireless"
 
@@ -6219,7 +6230,7 @@ msgstr "Wireless está desativado"
 msgid "Wireless network is enabled"
 msgstr "A rede wireless está ativada"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Escrever os pedidos de DNS para o syslog"
 
@@ -6252,9 +6263,9 @@ msgstr ""
 "como por exemplo \"rede/network\", o aparelho poderá tornar-se inacessível!</"
 "strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6278,7 +6289,7 @@ msgstr "Configurações do ZRam"
 msgid "ZRam Size"
 msgstr "Tamanho do ZRam"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "qualquer"
 
@@ -6367,13 +6378,14 @@ msgstr "desativado"
 msgid "driver default"
 msgstr "padrão do driver"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "expirou"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6427,7 +6439,7 @@ msgstr "chave entre 8 e 63 caracteres"
 msgid "key with either 5 or 13 characters"
 msgstr "chave com 5 ou 13 caracteres"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 "Ficheiro local de <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
@@ -6465,16 +6477,16 @@ msgstr "não presente"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "desligado"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "ligado"
@@ -6552,8 +6564,9 @@ msgstr "valor único"
 msgid "unknown"
 msgstr "desconhecido"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6581,6 +6594,7 @@ msgid "untagged"
 msgstr "não etiquetado"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr "endereço IP válido"
 
@@ -6593,6 +6607,7 @@ msgid "valid IPv4 CIDR"
 msgstr "CIDR IPv4 válido"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr "endereço IPv4 válido"
 
@@ -6621,6 +6636,7 @@ msgid "valid IPv6 CIDR"
 msgstr "CIDR IPv6 válido"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr "endereço IPv6 válido"
 
@@ -6680,6 +6696,9 @@ msgstr "host:porto válido"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr "nome de host válido"
 
@@ -6705,6 +6724,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr "porta ou intervalo de portas válido (porta1-porta2)"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr "valor de porta válido"
 
@@ -6752,6 +6772,18 @@ msgstr "sim"
 msgid "« Back"
 msgstr "« Voltar"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Endereço incorreto especificado!"
+
+#~ msgid "Install iputils-traceroute6 for IPv6 traceroute"
+#~ msgstr "Instale o iputils-traceroute6 para ver o rasto das rotas IPv6"
+
+#~ msgid "Loading"
+#~ msgstr "A carregar"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "A aguardar que o comando termine..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Atribuir interfaces..."
 
diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po
index b9c2e1ce3..1fbdbb224 100644
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -42,6 +42,8 @@ msgstr "(%d fereastra minute, %d interval secunde)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -148,15 +150,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr>port de apelare"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> port server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -168,7 +170,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Adresa <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -194,12 +196,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Poarta Acces"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configurare"
 
@@ -207,22 +210,22 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configurare"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Nume"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Addresa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -230,7 +233,7 @@ msgstr ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> marime pachet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Max.</abbr> interogari simultane"
 
@@ -349,6 +352,7 @@ msgstr "Conexiuni active"
 msgid "Active DHCP Leases"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr ""
@@ -404,7 +408,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Adauga un sufix local numelor servite din fisierele de tip hosts"
 
@@ -417,11 +421,11 @@ msgstr "Adauga interfata noua.."
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Fisiere de tip hosts aditionale"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -442,12 +446,13 @@ msgstr "Adresa"
 msgid "Address to access local relay bridge"
 msgstr "Adresa de acces punte locala repetor"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administrare"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -476,17 +481,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -511,7 +516,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr "Permite doar cele listate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Permite localhost"
 
@@ -527,7 +532,7 @@ msgstr "Permite autentificarea contului root cu parola"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Permite contului <em>root</em> sa se autentifice cu parola"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -699,7 +704,7 @@ msgstr "Autentificare"
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Autoritare"
 
@@ -707,11 +712,11 @@ msgstr "Autoritare"
 msgid "Authorization Required"
 msgstr "Necesita Autorizare"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -805,6 +810,7 @@ msgid "Backup"
 msgstr "Salveaza"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Salveaza / Scrie Firmware"
 
@@ -813,10 +819,6 @@ msgstr "Salveaza / Scrie Firmware"
 msgid "Backup file list"
 msgstr "Salveaza lista fisiere"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Adresa specificata gresit !"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -834,7 +836,7 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -854,7 +856,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Bogus NX Domain Override"
 
@@ -1043,10 +1045,11 @@ msgid "Close list..."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Colectez datele.."
 
@@ -1075,7 +1078,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Configurare"
@@ -1115,7 +1117,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Conexiuni"
 
@@ -1208,8 +1210,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr "Server DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP si DNS"
 
@@ -1244,7 +1246,7 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr ""
 
@@ -1252,11 +1254,11 @@ msgstr ""
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1285,6 +1287,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1423,8 +1426,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Diagnosticuri"
 
@@ -1483,7 +1485,7 @@ msgstr "Dezactivat"
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
@@ -1517,7 +1519,7 @@ msgstr "Optimizarea distantei"
 msgid "Distance to farthest network member in meters."
 msgstr "Distanta catre cel mai departat membru din retea in metri."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1525,15 +1527,15 @@ msgid ""
 "firewalls"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1553,11 +1555,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Domeniul necesar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr ""
 
@@ -1565,7 +1567,7 @@ msgstr ""
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1706,7 +1708,7 @@ msgstr ""
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Activeaza serverul TFTP"
 
@@ -1826,11 +1828,11 @@ msgstr "Adaptor de retea ethernet"
 msgid "Ethernet Switch"
 msgstr "Switch-ul ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr ""
 
@@ -1839,6 +1841,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1915,7 +1924,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1924,11 +1933,11 @@ msgstr ""
 msgid "Filesystem"
 msgstr "Sistem de fisiere"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Filtreaza privatele"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Filtreaza nefolositele"
 
@@ -1951,7 +1960,7 @@ msgstr "Gaseste si alatura in retea"
 msgid "Finish"
 msgstr "Termina"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -1975,7 +1984,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Versiunea de firmware"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Portul sursa pentru intrebarile DNS catre exterior"
 
@@ -2104,7 +2113,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2143,9 +2152,9 @@ msgstr ""
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr ""
@@ -2198,6 +2207,7 @@ msgstr "Ascunde <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2221,7 +2231,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2234,7 +2244,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Nume de host"
 
@@ -2272,13 +2282,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2346,6 +2356,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2356,8 +2368,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2427,6 +2437,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2518,7 +2529,7 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
@@ -2526,7 +2537,7 @@ msgstr ""
 msgid "Ignore interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr ""
 
@@ -2578,10 +2589,6 @@ msgstr "Script de initializare"
 msgid "Initscripts"
 msgstr "Scripturi de initializare"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr ""
@@ -2643,7 +2650,7 @@ msgstr "Interfata nu e prezenta sau nu este conectata inca."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Interfete"
 
@@ -2701,9 +2708,9 @@ msgstr ""
 "Se pare ca ai incercat sa rescrii o imagine care nu are loc in memoria "
 "flash, verifica fisierul din nou!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "Ai nevoie de JavaScript !"
@@ -2724,8 +2731,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Log-ul kernelului"
 
@@ -2801,16 +2808,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2837,11 +2845,11 @@ msgstr "Legenda:"
 msgid "Limit"
 msgstr "Limita"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2865,7 +2873,7 @@ msgstr ""
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2893,15 +2901,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2913,12 +2921,12 @@ msgstr ""
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Incarcarea"
 
@@ -2926,10 +2934,6 @@ msgstr "Incarcarea"
 msgid "Load Average"
 msgstr "Incarcarea medie"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Incarcare"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -2962,7 +2966,7 @@ msgstr "Adresa IPv4 locala"
 msgid "Local IPv6 address"
 msgstr "Adresa IPv6 locala"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -2975,31 +2979,31 @@ msgstr ""
 msgid "Local Time"
 msgstr "Ora locala"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Domeniu local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Server local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr ""
 
@@ -3007,7 +3011,7 @@ msgstr ""
 msgid "Log output level"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr ""
 
@@ -3019,7 +3023,7 @@ msgstr ""
 msgid "Login"
 msgstr "Autentificare"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Iesire"
 
@@ -3116,15 +3120,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Numarul maxim de intrebari DNS simultane"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
@@ -3264,6 +3268,7 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -3355,11 +3360,10 @@ msgstr "Nume"
 msgid "Name of the new network"
 msgstr "Numele interfetei noi"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navigare"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3367,14 +3371,15 @@ msgstr "Navigare"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Retea"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Utilitare de retea"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr ""
 
@@ -3432,13 +3437,13 @@ msgstr "Nici o informatie disponibila"
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Nici o parola setata !"
@@ -3484,7 +3489,7 @@ msgstr "Zgomot:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3526,11 +3531,11 @@ msgstr ""
 msgid "Notice"
 msgstr "Notificare"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3577,7 +3582,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
@@ -3752,7 +3757,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Prezentare generala"
 
@@ -3980,8 +3985,9 @@ msgstr "Rata phy:"
 msgid "Physical Settings"
 msgstr "Setarile fizice"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4057,7 +4063,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4070,7 +4076,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Procese"
 
@@ -4127,7 +4133,7 @@ msgstr ""
 msgid "Quality"
 msgstr "Calitate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4194,7 +4200,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4206,7 +4212,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Grafice in timp real"
 
@@ -4214,12 +4220,13 @@ msgstr "Grafice in timp real"
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Rebooteaza"
 
@@ -4347,7 +4354,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4393,11 +4400,11 @@ msgstr "Reseteaza counterii"
 msgid "Reset to defaults"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Fisierele de rezolvare si hosturi DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Fisierul de rezolvare"
 
@@ -4449,7 +4456,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4475,12 +4482,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Parola routerului"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Rute"
 
@@ -4516,6 +4524,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Acces SSH"
 
@@ -4533,6 +4542,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Cheile SSH"
 
@@ -4577,6 +4587,7 @@ msgstr "Scan"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Operatiuni programate"
 
@@ -4616,7 +4627,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Setarile serverului"
 
@@ -4629,7 +4640,7 @@ msgstr "Nume serviciu"
 msgid "Service Type"
 msgstr "Tip de serviciu"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Servicii"
 
@@ -4720,7 +4731,7 @@ msgstr "Semnal:"
 msgid "Size"
 msgstr "Marime"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4733,11 +4744,11 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr ""
 
@@ -4838,6 +4849,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Pornire"
 
@@ -4849,11 +4861,11 @@ msgstr "Rute statice IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Rute statice IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Rute statice"
 
@@ -4863,7 +4875,7 @@ msgstr "Rute statice"
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4874,10 +4886,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "stsatus"
 
@@ -4887,7 +4899,7 @@ msgstr "stsatus"
 msgid "Stop"
 msgstr "Stop"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr ""
 
@@ -4900,11 +4912,11 @@ msgstr ""
 msgid "Submit"
 msgstr "Trimite"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4913,7 +4925,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr ""
 
@@ -4961,15 +4973,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistem"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Log de sistem"
 
@@ -4985,11 +4998,11 @@ msgstr ""
 msgid "TCP:"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Setarile TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr ""
 
@@ -5207,7 +5220,8 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5217,9 +5231,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5240,7 +5254,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5273,7 +5287,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5341,14 +5355,15 @@ msgstr ""
 msgid "Total Available"
 msgstr "Total disponibil"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Trafic"
 
@@ -5576,7 +5591,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Uptime"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Foloseste <code>/etc/ethers</code>"
 
@@ -5687,7 +5702,7 @@ msgstr ""
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5736,7 +5751,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr "VLANuri pe %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5816,10 +5831,6 @@ msgstr ""
 "Criptarea WPA necesita wpa_supplicant (pentru modul client) sau hostapd "
 "(pentru modul AP sau ad-hoc) instalate."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr ""
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5854,9 +5865,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Wireless"
 
@@ -5904,7 +5915,7 @@ msgstr "Reteaua wireless este dezactivata"
 msgid "Wireless network is enabled"
 msgstr "Reteaua wireless este activata"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Scrie cererile DNS primite in syslog"
 
@@ -5930,9 +5941,9 @@ msgid ""
 "scripts like \"network\", your device might become inaccessible!</strong>"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -5954,7 +5965,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "oricare"
 
@@ -6043,13 +6054,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "expirat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6101,7 +6113,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 
@@ -6138,16 +6150,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr ""
@@ -6225,8 +6237,9 @@ msgstr ""
 msgid "unknown"
 msgstr "necunoscut"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6254,6 +6267,7 @@ msgid "untagged"
 msgstr "neetichetat"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6266,6 +6280,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6294,6 +6309,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6353,6 +6369,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6378,6 +6397,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6425,6 +6445,12 @@ msgstr "da"
 msgid "« Back"
 msgstr "« Inapoi"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Adresa specificata gresit !"
+
+#~ msgid "Loading"
+#~ msgstr "Incarcare"
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Inregistreaza interfetele"
 
diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index d8c9d2673..a01f6f2bb 100644
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -45,6 +45,8 @@ msgstr "(%d минутное окно, %d секундный интервал)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -153,15 +155,15 @@ msgstr "802.11w время ожидания повтора"
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Идентификатор Набора Базовых Сервисов\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Система доменных имён\">DNS</abbr> порт запроса"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Система доменных имен\">DNS</abbr> порт сервера"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -173,7 +175,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Расширенный идентификатор обслуживания\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Интернет протокол версии 4\">IPv4</abbr>-адрес"
@@ -199,12 +201,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Интернет протокол версии 6\">IPv6</abbr>-шлюз"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr "<abbr title=\"Интернет протокол версии 6\">IPv6</abbr>-суффикс (hex)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Настройка <abbr title=\"Светодиод\">LED</abbr> индикации"
 
@@ -212,16 +215,16 @@ msgstr "Настройка <abbr title=\"Светодиод\">LED</abbr> инд�
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Имя <abbr title=\"Светодиод\">LED</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Управление доступом к носителю\">MAC</abbr>-адрес"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr "<abbr title=\"Уникальный идентификатор DHCP\">DUID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -229,7 +232,7 @@ msgstr ""
 "<abbr title=\"максимальное\">Макс.</abbr> кол-во аренд <abbr title="
 "\"Протокол динамической настройки узла\">DHCP</abbr> аренды"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -237,7 +240,7 @@ msgstr ""
 "<abbr title=\"максимальный\">Макс.</abbr><abbr title=\"Extension Mechanisms "
 "for Domain Name System\">EDNS0</abbr> размер пакета"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 "<abbr title=\"максимальное\">Макс.</abbr> кол-во одновременных запросов"
@@ -361,6 +364,7 @@ msgstr "Активные соединения"
 msgid "Active DHCP Leases"
 msgstr "Активные DHCP аренды"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Активные DHCPv6 аренды"
@@ -416,7 +420,7 @@ msgstr "Добавить экземпляр"
 msgid "Add key"
 msgstr "Добавить ключ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "Добавить локальный суффикс домена для имен из файла хостов (/etc/hosts)"
@@ -430,11 +434,11 @@ msgstr "Добавить новый интерфейс..."
 msgid "Add peer"
 msgstr "Добавить узел (peer)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Дополнительный hosts файл"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "Дополнительные файлы серверов"
 
@@ -455,12 +459,13 @@ msgstr "Адрес"
 msgid "Address to access local relay bridge"
 msgstr "Адрес для доступа к локальному мосту-ретранслятору"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Управление"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -489,18 +494,18 @@ msgstr "Псевдоним"
 msgid "Alias of \"%s\""
 msgstr "Псевдоним интерфейса \"%s\""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr "Все серверы"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 "Выделять IP-адреса последовательно, начинать с меньшего доступного адреса"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr "Выделять IP-адреса последовательно"
 
@@ -528,7 +533,7 @@ msgstr "Разрешить использование стандарта 802.11b
 msgid "Allow listed only"
 msgstr "Разрешить только перечисленные"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Разрешить локальный хост"
 
@@ -547,7 +552,7 @@ msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 "Разрешить пользователю <em>root</em> входить в систему с помощью пароля"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -729,7 +734,7 @@ msgstr "Аутентификация"
 msgid "Authentication Type"
 msgstr "Тип аутентификации"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Основной"
 
@@ -737,11 +742,11 @@ msgstr "Основной"
 msgid "Authorization Required"
 msgstr "Выполните аутентификацию"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -841,6 +846,7 @@ msgid "Backup"
 msgstr "Резервное копирование"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Резервное копирование / Перепрошивка"
 
@@ -849,10 +855,6 @@ msgstr "Резервное копирование / Перепрошивка"
 msgid "Backup file list"
 msgstr "Список файлов для резервного копирования"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Указан неправильный адрес!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -873,7 +875,7 @@ msgstr ""
 "состоит из измененных config файлов, отмеченных opkg, необходимых базовых "
 "файлов, а также шаблонов резервного копирования, определенных пользователем."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -895,7 +897,7 @@ msgstr "Открытый туннель для этого интерфейса (
 msgid "Bitrate"
 msgstr "Скорость"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Переопределение поддельного NX-домена"
 
@@ -1097,10 +1099,11 @@ msgid "Close list..."
 msgstr "Закрыть список..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Сбор данных..."
 
@@ -1133,7 +1136,6 @@ msgstr ""
 "нового ключа, при наличии большого трафика."
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Настройка config файла"
@@ -1173,7 +1175,7 @@ msgstr "Ошибка попытки соединения"
 msgid "Connection lost"
 msgstr "Подключение потеряно"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Соединения"
 
@@ -1273,8 +1275,8 @@ msgstr "DAE-секрет"
 msgid "DHCP Server"
 msgstr "DHCP-сервер"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP и DNS"
 
@@ -1309,7 +1311,7 @@ msgstr "DHCPv6 сервис"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "Перенаправление запросов DNS"
 
@@ -1317,11 +1319,11 @@ msgstr "Перенаправление запросов DNS"
 msgid "DNS-Label / FQDN"
 msgstr "DNS-Label / FQDN"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr "DNSSEC проверка без знака"
 
@@ -1350,6 +1352,7 @@ msgstr "DSL линейный режим"
 msgid "DTIM Interval"
 msgstr "Интервал DTIM"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1491,8 +1494,7 @@ msgstr "Устройство недоступно!"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "Устройство недоступно! Ожидание устройства..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Диагностика"
 
@@ -1551,7 +1553,7 @@ msgstr "Отключено"
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Не ассоциировать при низком подтверждении"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Отбрасывать ответы внешней сети RFC1918"
 
@@ -1585,7 +1587,7 @@ msgstr "Оптимизация расстояния"
 msgid "Distance to farthest network member in meters."
 msgstr "Расстояние до самого удалённого сетевого узла в метрах."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1597,17 +1599,17 @@ msgstr ""
 "прокси для сетевых экранов <abbr title=\"Преобразование сетевых адресов"
 "\">NAT</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr "Не кешировать отрицательные ответы, в т.ч. для несуществующих доменов"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Не перенаправлять запросы, которые не могут быть обработаны публичными DNS-"
 "серверами"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Не перенаправлять обратные DNS-запросы для локальных сетей"
 
@@ -1627,11 +1629,11 @@ msgstr "Вы действительно хотите стереть все на�
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr "Вы действительно хотите рекурсивно удалить директорию «%s»?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Требуется домен"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Белый список доменов"
 
@@ -1639,7 +1641,7 @@ msgstr "Белый список доменов"
 msgid "Don't Fragment"
 msgstr "Не фрагментировать"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1791,7 +1793,7 @@ msgstr "Включить NTP-клиент"
 msgid "Enable Single DES"
 msgstr "Включить Single DES"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Включить TFTP-сервер"
 
@@ -1913,11 +1915,11 @@ msgstr "Ethernet-адаптер"
 msgid "Ethernet Switch"
 msgstr "Ethernet-коммутатор"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr "Исключите интерфейсы"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Расширять имена узлов"
 
@@ -1926,6 +1928,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr "Ожидается шестнадцатеричное значение подсказки присвоения"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr "Ожидается: %s"
 
@@ -2005,7 +2014,7 @@ msgstr "Файл не доступен"
 msgid "Filename"
 msgstr "Имя файла"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "Имя загрузочного образа, извещаемого клиентам"
 
@@ -2014,11 +2023,11 @@ msgstr "Имя загрузочного образа, извещаемого к�
 msgid "Filesystem"
 msgstr "Файловая система"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Фильтровать частные"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Фильтровать бесполезные"
 
@@ -2044,7 +2053,7 @@ msgstr "Найти и присоединиться к сети"
 msgid "Finish"
 msgstr "Завершить"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Межсетевой экран"
 
@@ -2068,7 +2077,7 @@ msgstr "Файл прошивки"
 msgid "Firmware Version"
 msgstr "Версия прошивки"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Фиксированный порт для исходящих DNS-запросов"
 
@@ -2198,7 +2207,7 @@ msgstr "Неверный адрес шлюза"
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2237,9 +2246,9 @@ msgstr "Основные настройки"
 msgid "Global network options"
 msgstr "Основные настройки сети"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Перейти к настройке пароля..."
@@ -2292,6 +2301,7 @@ msgstr "Скрыть <abbr title=\"Расширенный идентификат
 msgid "Hide empty chains"
 msgstr "Скрыть пустые цепочки"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2315,7 +2325,7 @@ msgid "Host-Uniq tag content"
 msgstr "Содержимое Host-Uniq тега"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2328,7 +2338,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "Имя хоста в DHCP-запросах"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Имена хостов"
 
@@ -2366,13 +2376,13 @@ msgstr "Неверный IP-адрес"
 msgid "IP address is missing"
 msgstr "IP-адрес не указан"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2440,6 +2450,8 @@ msgstr "IPv4-в-IPv4 (RFC2003)"
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2450,8 +2462,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2521,6 +2531,7 @@ msgstr "IPv6 направление префикса"
 msgid "IPv6 suffix"
 msgstr "IPv6 суффикс"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2622,7 +2633,7 @@ msgstr ""
 "устройство, на котором располагается раздел подкачки, работает гораздо "
 "медленнее, чем <abbr title=\"Random Access Memory\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Игнорировать <code>/etc/hosts</code>"
 
@@ -2630,7 +2641,7 @@ msgstr "Игнорировать <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Игнорировать интерфейс"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Игнорировать файл resolv"
 
@@ -2685,10 +2696,6 @@ msgstr "Скрипт инициализации"
 msgid "Initscripts"
 msgstr "Скрипты инициализации"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr "Для поддержки IPv6, установите пакет iputils-traceroute6"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Установить расширения протокола..."
@@ -2750,7 +2757,7 @@ msgstr "Интерфейс не существует или пока не под
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Интерфейсы"
 
@@ -2809,9 +2816,9 @@ msgstr ""
 "Оказалось, что вы пытаетесь прошить устройство прошивкой, которая по размеру "
 "не помещается в чип флэш-памяти, проверьте ваш файл прошивки!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "Требуется JavaScript!"
@@ -2832,8 +2839,8 @@ msgstr "Подключение к сети: %q"
 msgid "Keep settings and retain the current configuration"
 msgstr "Сохранить настройки и оставить текущую конфигурацию"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Журнал ядра"
 
@@ -2909,16 +2916,17 @@ msgstr "Задержка"
 msgid "Leaf"
 msgstr "Лист"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "Время аренды адреса"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Файл аренд"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2945,11 +2953,11 @@ msgstr "События:"
 msgid "Limit"
 msgstr "Предел"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr "Ограничение сервиса DNS, для подсетей интерфейса использующего DNS."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "Ограничьте прослушивание этих интерфейсов и замыкание на себя."
 
@@ -2973,7 +2981,7 @@ msgstr "Время бесперебойной работы линии"
 msgid "Link On"
 msgstr "Подключение"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -3013,15 +3021,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr "Список файлов ключей SSH для авторизации"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Список доменов, для которых разрешены ответы RFC1918"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "Список хостов, поставляющих поддельные результаты домена NX"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr "Интерфейс для входящих соединений"
 
@@ -3035,12 +3043,12 @@ msgstr ""
 "Принимать подключения только на указанном интерфейсе или, если интерфейс не "
 "задан, на всех интерфейсах"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Порт для входящих DNS-запросов"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Загрузка"
 
@@ -3048,10 +3056,6 @@ msgstr "Загрузка"
 msgid "Load Average"
 msgstr "Средняя загрузка"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Загружаем"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr "Загрузка содержимого директории..."
@@ -3084,7 +3088,7 @@ msgstr "Локальный IPv4-адрес"
 msgid "Local IPv6 address"
 msgstr "Локальный IPv6-адрес"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr "Только локальный DNS"
 
@@ -3097,11 +3101,11 @@ msgstr "Запуск пакетов и служб пользователя, пр
 msgid "Local Time"
 msgstr "Дата и время"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Локальный домен"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3110,17 +3114,17 @@ msgstr ""
 "передаются. И разрешаются только из файла DHCP (/etc/config/dhcp) или файла "
 "хостов (/etc/hosts)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 "Суффикс локального домена, который будет добавлен к DHCP-именам и записи "
 "файла хостов (/etc/hosts)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Локальный сервер"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3128,7 +3132,7 @@ msgstr ""
 "Локализировать имя хоста в зависимости от запрашиваемой подсети, если "
 "доступно несколько IP-адресов"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Локализовывать запросы"
 
@@ -3136,7 +3140,7 @@ msgstr "Локализовывать запросы"
 msgid "Log output level"
 msgstr "Запись событий"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Запись запросов"
 
@@ -3148,7 +3152,7 @@ msgstr "Настройка журнала"
 msgid "Login"
 msgstr "Войти"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Выйти"
 
@@ -3247,15 +3251,15 @@ msgstr "Max. Attainable Data Rate (ATTNDR)"
 msgid "Maximum allowed Listen Interval"
 msgstr "Максимально разрешенное значение интервала прослушивания клиента"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Максимальное количество активных арендованных DHCP-адресов"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Максимально допустимое количество одновременных DNS-запросов"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Максимально допустимый размер UDP пакетов EDNS.0"
 
@@ -3395,6 +3399,7 @@ msgstr "Точка монтирования"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Монтирование разделов"
 
@@ -3488,11 +3493,10 @@ msgstr "Имя"
 msgid "Name of the new network"
 msgstr "Имя новой сети"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Навигация"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3500,14 +3504,15 @@ msgstr "Навигация"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Сеть"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Сетевые утилиты"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Образ системы для сетевой загрузки"
 
@@ -3565,13 +3570,13 @@ msgstr "Нет доступной информации"
 msgid "No matching prefix delegation"
 msgstr "Отсутствует соответствующая делегация префикса"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Отключить кэш отрицательных ответов"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Пароль не установлен!"
@@ -3617,7 +3622,7 @@ msgstr "Шум:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "Non Pre-emtive CRC errors (CRC_P)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr "Не использовать wildcard"
 
@@ -3659,11 +3664,11 @@ msgstr "Не поддерживается"
 msgid "Notice"
 msgstr "Заметка"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "DNS-запрос"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 "Количество кэшированных DNS записей (максимум — 10000, 0 — отключить "
@@ -3712,7 +3717,7 @@ msgstr "On-link маршрут"
 msgid "On-State Delay"
 msgstr "Задержка включенного состояния"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "Должен быть указан либо MAC-адрес, либо имя хоста!"
 
@@ -3903,7 +3908,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr "Назначить таблицу внутренних маршрутов"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Обзор"
 
@@ -4131,8 +4136,9 @@ msgstr "Скорость:"
 msgid "Physical Settings"
 msgstr "Настройки канала"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Пинг-запрос"
 
@@ -4210,7 +4216,7 @@ msgstr ""
 "Предполагать, что узел недоступен после указанного количества ошибок "
 "получения эхо-пакета LCP, введите '0' для игнорирования ошибок"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr "Запретить прослушивание этих интерфейсов."
 
@@ -4223,7 +4229,7 @@ msgid "Private Key"
 msgstr "Приватный ключ"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Процессы"
 
@@ -4286,7 +4292,7 @@ msgstr "QMI сотовый"
 msgid "Quality"
 msgstr "Качество"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4357,7 +4363,7 @@ msgstr ""
 "Строка в шестнадцатеричном коде. Оставьте пустой, если ваш провайдер не "
 "требует этого"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4369,7 +4375,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "Вы действительно хотите изменить протокол?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Графики в реальном времени"
 
@@ -4377,12 +4383,13 @@ msgstr "Графики в реальном времени"
 msgid "Reassociation Deadline"
 msgstr "Срок реассоциации"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "Защита от DNS Rebinding"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Перезагрузка"
 
@@ -4516,7 +4523,7 @@ msgstr ""
 "Требуется 'полная' версия wpad/hostapd и поддержка со стороны WiFi драйвера  "
 "в  <br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4564,11 +4571,11 @@ msgstr "Сбросить счётчики"
 msgid "Reset to defaults"
 msgstr "Сбросить на значения по умолчанию"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Файлы resolv и hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Файл resolv"
 
@@ -4620,7 +4627,7 @@ msgstr "Ошибка <code>%h</code> отмены конфигурации"
 msgid "Reverting configuration…"
 msgstr "Отмена конфигурации..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Корневая директория для файлов сервера, вроде TFTP"
 
@@ -4646,12 +4653,13 @@ msgstr "Доступные режимы работы"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Пароль маршрутизатора"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Маршруты"
 
@@ -4689,6 +4697,7 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Доступ по SSH"
 
@@ -4706,6 +4715,7 @@ msgstr "SSH логин"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH ключи"
 
@@ -4750,6 +4760,7 @@ msgstr "Поиск"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Запланированные задания"
 
@@ -4794,7 +4805,7 @@ msgstr ""
 "Отправлять эхо-пакеты LCP с указанным интервалом (секунды), эффективно "
 "только в сочетании с порогом ошибок"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Настройки сервера"
 
@@ -4807,7 +4818,7 @@ msgstr "Имя службы"
 msgid "Service Type"
 msgstr "Тип службы"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Сервисы"
 
@@ -4899,7 +4910,7 @@ msgstr "Сигнал:"
 msgid "Size"
 msgstr "Размер"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr "Размер кэша DNS запроса"
 
@@ -4912,11 +4923,11 @@ msgstr "Размер ZRam в мегабайтах"
 msgid "Skip"
 msgstr "Пропустить"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Перейти к содержимому"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Перейти к навигации"
 
@@ -5031,6 +5042,7 @@ msgstr "Начато сканирование беспроводных сете�
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Загрузка"
 
@@ -5042,11 +5054,11 @@ msgstr "Статические маршруты IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Статические маршруты IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Постоянные аренды"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Статические маршруты"
 
@@ -5056,7 +5068,7 @@ msgstr "Статические маршруты"
 msgid "Static address"
 msgstr "Статический адрес"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -5070,10 +5082,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr "Максимально допустимое время бездействия клиента"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Состояние"
 
@@ -5083,7 +5095,7 @@ msgstr "Состояние"
 msgid "Stop"
 msgstr "Остановить"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Строгий порядок"
 
@@ -5096,11 +5108,11 @@ msgstr "Сильная"
 msgid "Submit"
 msgstr "Применить"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr "Подавить логирование"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Подавить логирование стандартной работы этих протоколов"
 
@@ -5109,7 +5121,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Коммутатор"
 
@@ -5159,15 +5171,16 @@ msgstr "Синхронизировать с NTP-сервером"
 msgid "Sync with browser"
 msgstr "Синхронизировать с браузером"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Система"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Системный журнал"
 
@@ -5183,11 +5196,11 @@ msgstr "Размер системного журнала"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Настройки TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "TFTP сервер root"
 
@@ -5443,7 +5456,8 @@ msgstr ""
 "Загруженный файл прошивки не поддерживается. Проверьте, что вы загрузили "
 "подходящую прошивку для чипа вашего устройства."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5453,9 +5467,9 @@ msgstr "Нет активных арендованных адресов"
 msgid "There are no changes to apply"
 msgstr "Нет изменений для применения"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5476,7 +5490,7 @@ msgstr "Этот тип аутентификации не применим к в
 msgid "This does not look like a valid PEM file"
 msgstr "Это не похоже на корректный PEM файл"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5522,7 +5536,7 @@ msgstr ""
 "Это локальный адрес, назначенный туннельным брокером, обычно заканчивается "
 "на <code>...:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5599,14 +5613,15 @@ msgstr "Тон"
 msgid "Total Available"
 msgstr "Всего доступно"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Трассировка"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Трафик"
 
@@ -5838,7 +5853,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Время работы"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Использовать <code>/etc/ethers</code>"
 
@@ -5949,7 +5964,7 @@ msgstr "Использовать метрику шлюза"
 msgid "Use routing table"
 msgstr "Использовать таблицу маршрутизации"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -6006,7 +6021,7 @@ msgstr "VDSL"
 msgid "VLANs on %q"
 msgstr "VLANы на %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr "VPN"
 
@@ -6087,10 +6102,6 @@ msgstr ""
 "Необходимо установить wpa_supplicant (режим клиента) или hostapd (режим "
 "точки доступа или ad-hoc) для поддержки шифрования WPA."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "Ожидание завершения выполнения команды..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "Ожидание подключения устройства..."
@@ -6130,9 +6141,9 @@ msgstr "Ширина"
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Wi-Fi"
 
@@ -6180,7 +6191,7 @@ msgstr "Беспроводная сеть отключена"
 msgid "Wireless network is enabled"
 msgstr "Беспроводная сеть включена"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Записывать полученные DNS-запросы в системный журнал"
 
@@ -6212,9 +6223,9 @@ msgstr ""
 "если вы выключите один из основных скриптов инициализации (например "
 "'network'), ваше устройство может оказаться недоступным!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6238,7 +6249,7 @@ msgstr "Настройки ZRam"
 msgid "ZRam Size"
 msgstr "Размер ZRam"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "любой"
 
@@ -6327,13 +6338,14 @@ msgstr "отключено"
 msgid "driver default"
 msgstr "умолчания драйвера"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "истекло"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6387,7 +6399,7 @@ msgstr "ключ длиной от 8 до 63 символов"
 msgid "key with either 5 or 13 characters"
 msgstr "ключ длиной 5 или 13 символов"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Локальный <abbr title=\"Служба доменных имён\">DNS</abbr>-файл"
 
@@ -6424,16 +6436,16 @@ msgstr "не существует"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "выключено"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "включено"
@@ -6511,8 +6523,9 @@ msgstr "уникальное значение"
 msgid "unknown"
 msgstr "неизвестный"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6540,6 +6553,7 @@ msgid "untagged"
 msgstr "без тега"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr "верный IP-адрес"
 
@@ -6552,6 +6566,7 @@ msgid "valid IPv4 CIDR"
 msgstr "верная IPv4 CIDR"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr "верный IPv4 адрес"
 
@@ -6580,6 +6595,7 @@ msgid "valid IPv6 CIDR"
 msgstr "верная IPv6 CIDR"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr "верный IPv6 адрес"
 
@@ -6639,6 +6655,9 @@ msgstr "верное имя хоста:порт"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr "верное имя хоста"
 
@@ -6664,6 +6683,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr "верный порт или диапазон портов (порт1-порт2)"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr "верное значение порта"
 
@@ -6711,6 +6731,18 @@ msgstr "да"
 msgid "« Back"
 msgstr "« Назад"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Указан неправильный адрес!"
+
+#~ msgid "Install iputils-traceroute6 for IPv6 traceroute"
+#~ msgstr "Для поддержки IPv6, установите пакет iputils-traceroute6"
+
+#~ msgid "Loading"
+#~ msgstr "Загружаем"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "Ожидание завершения выполнения команды..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Назначить интерфейсы..."
 
diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po
index 16a1a1f85..ec25f1aff 100644
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -38,6 +38,8 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -144,15 +146,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -162,7 +164,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr ""
@@ -187,12 +189,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
@@ -200,28 +203,28 @@ msgstr ""
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
@@ -337,6 +340,7 @@ msgstr ""
 msgid "Active DHCP Leases"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr ""
@@ -392,7 +396,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
@@ -405,11 +409,11 @@ msgstr ""
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -430,12 +434,13 @@ msgstr ""
 msgid "Address to access local relay bridge"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -464,17 +469,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -498,7 +503,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr ""
 
@@ -514,7 +519,7 @@ msgstr ""
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -685,7 +690,7 @@ msgstr ""
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr ""
 
@@ -693,11 +698,11 @@ msgstr ""
 msgid "Authorization Required"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -791,6 +796,7 @@ msgid "Backup"
 msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -799,10 +805,6 @@ msgstr ""
 msgid "Backup file list"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr ""
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -820,7 +822,7 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -840,7 +842,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr ""
 
@@ -1026,10 +1028,11 @@ msgid "Close list..."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr ""
 
@@ -1058,7 +1061,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr ""
@@ -1098,7 +1100,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr ""
 
@@ -1191,8 +1193,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr ""
 
@@ -1227,7 +1229,7 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr ""
 
@@ -1235,11 +1237,11 @@ msgstr ""
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1268,6 +1270,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1406,8 +1409,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr ""
 
@@ -1464,7 +1466,7 @@ msgstr ""
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
@@ -1498,7 +1500,7 @@ msgstr ""
 msgid "Distance to farthest network member in meters."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1506,15 +1508,15 @@ msgid ""
 "firewalls"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1534,11 +1536,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr ""
 
@@ -1546,7 +1548,7 @@ msgstr ""
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1687,7 +1689,7 @@ msgstr ""
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr ""
 
@@ -1807,11 +1809,11 @@ msgstr ""
 msgid "Ethernet Switch"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr ""
 
@@ -1820,6 +1822,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1896,7 +1905,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1905,11 +1914,11 @@ msgstr ""
 msgid "Filesystem"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr ""
 
@@ -1932,7 +1941,7 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr ""
 
@@ -1956,7 +1965,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2084,7 +2093,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2123,9 +2132,9 @@ msgstr ""
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr ""
@@ -2176,6 +2185,7 @@ msgstr ""
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2199,7 +2209,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2212,7 +2222,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr ""
 
@@ -2250,13 +2260,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
@@ -2324,6 +2334,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2334,8 +2346,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr ""
@@ -2405,6 +2415,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2496,7 +2507,7 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
@@ -2504,7 +2515,7 @@ msgstr ""
 msgid "Ignore interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr ""
 
@@ -2556,10 +2567,6 @@ msgstr ""
 msgid "Initscripts"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr ""
@@ -2621,7 +2628,7 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr ""
 
@@ -2676,9 +2683,9 @@ msgid ""
 "flash memory, please verify the image file!"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr ""
@@ -2699,8 +2706,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr ""
 
@@ -2776,16 +2783,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2812,11 +2820,11 @@ msgstr ""
 msgid "Limit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2840,7 +2848,7 @@ msgstr ""
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2868,15 +2876,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2888,12 +2896,12 @@ msgstr ""
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr ""
 
@@ -2901,10 +2909,6 @@ msgstr ""
 msgid "Load Average"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -2937,7 +2941,7 @@ msgstr ""
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -2950,31 +2954,31 @@ msgstr ""
 msgid "Local Time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr ""
 
@@ -2982,7 +2986,7 @@ msgstr ""
 msgid "Log output level"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr ""
 
@@ -2994,7 +2998,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr ""
 
@@ -3091,15 +3095,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
@@ -3239,6 +3243,7 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -3330,11 +3335,10 @@ msgstr ""
 msgid "Name of the new network"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3342,14 +3346,15 @@ msgstr ""
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr ""
 
@@ -3407,13 +3412,13 @@ msgstr ""
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr ""
@@ -3459,7 +3464,7 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3501,11 +3506,11 @@ msgstr ""
 msgid "Notice"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3552,7 +3557,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
@@ -3727,7 +3732,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr ""
 
@@ -3955,8 +3960,9 @@ msgstr ""
 msgid "Physical Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4032,7 +4038,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4045,7 +4051,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr ""
 
@@ -4102,7 +4108,7 @@ msgstr ""
 msgid "Quality"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4169,7 +4175,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4179,7 +4185,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr ""
 
@@ -4187,12 +4193,13 @@ msgstr ""
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr ""
 
@@ -4320,7 +4327,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4366,11 +4373,11 @@ msgstr ""
 msgid "Reset to defaults"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr ""
 
@@ -4422,7 +4429,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4448,12 +4455,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr ""
 
@@ -4489,6 +4497,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4506,6 +4515,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4550,6 +4560,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr ""
 
@@ -4589,7 +4600,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr ""
 
@@ -4602,7 +4613,7 @@ msgstr ""
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr ""
 
@@ -4693,7 +4704,7 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4706,11 +4717,11 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr ""
 
@@ -4811,6 +4822,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4822,11 +4834,11 @@ msgstr ""
 msgid "Static IPv6 Routes"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr ""
 
@@ -4836,7 +4848,7 @@ msgstr ""
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4847,10 +4859,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr ""
 
@@ -4860,7 +4872,7 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr ""
 
@@ -4873,11 +4885,11 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4886,7 +4898,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr ""
 
@@ -4934,15 +4946,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr ""
 
@@ -4958,11 +4971,11 @@ msgstr ""
 msgid "TCP:"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr ""
 
@@ -5180,7 +5193,8 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5190,9 +5204,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5211,7 +5225,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5244,7 +5258,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5312,14 +5326,15 @@ msgstr ""
 msgid "Total Available"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr ""
 
@@ -5547,7 +5562,7 @@ msgstr ""
 msgid "Uptime"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr ""
 
@@ -5658,7 +5673,7 @@ msgstr ""
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5707,7 +5722,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5785,10 +5800,6 @@ msgid ""
 "and ad-hoc mode) to be installed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr ""
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5823,9 +5834,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr ""
 
@@ -5873,7 +5884,7 @@ msgstr ""
 msgid "Wireless network is enabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
@@ -5899,9 +5910,9 @@ msgid ""
 "scripts like \"network\", your device might become inaccessible!</strong>"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -5923,7 +5934,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr ""
 
@@ -6012,13 +6023,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6070,7 +6082,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 
@@ -6107,16 +6119,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr ""
@@ -6194,8 +6206,9 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6223,6 +6236,7 @@ msgid "untagged"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6235,6 +6249,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6263,6 +6278,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6322,6 +6338,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6347,6 +6366,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index 5bd7596cc..359fc77ee 100644
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -41,6 +41,8 @@ msgstr "(%d minut-fönster, %d sekundintervall)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -147,15 +149,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr>server-port"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -165,7 +167,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-adress"
@@ -193,12 +195,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-gateway"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Lysdiod\">LED</abbr>-konfiguration"
 
@@ -206,28 +209,28 @@ msgstr "<abbr title=\"Lysdiod\">LED</abbr>-konfiguration"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
@@ -345,6 +348,7 @@ msgstr "Aktiva anslutningar"
 msgid "Active DHCP Leases"
 msgstr "Aktiva DHCP-kontrakt"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Aktiva DHCPv6-kontrakt"
@@ -400,7 +404,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
@@ -413,11 +417,11 @@ msgstr "Lägg till ett nytt gränssnitt..."
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Ytterligare värdfiler"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "Ytterligare server-filer"
 
@@ -438,12 +442,13 @@ msgstr "Adress"
 msgid "Address to access local relay bridge"
 msgstr "Adress för att komma åt lokal reläbrygga"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administration"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -472,18 +477,18 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 "Allokera IP-adresser sekventiellt med start från den lägsta möjliga adressen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr "Allokera IP sekventiellt"
 
@@ -507,7 +512,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr "Tillåt enbart listade"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Tillåt localhost"
 
@@ -525,7 +530,7 @@ msgstr "Tillåt root-inloggningar med lösenord"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Tillåt <em>root</em>-användaren att logga in med lösenord"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -696,7 +701,7 @@ msgstr "Autentisering"
 msgid "Authentication Type"
 msgstr "Typ av autentisering"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Auktoritiv"
 
@@ -704,11 +709,11 @@ msgstr "Auktoritiv"
 msgid "Authorization Required"
 msgstr "Tillstånd krävs"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -802,6 +807,7 @@ msgid "Backup"
 msgstr "Säkerhetskopiera"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Säkerhetskopiera / Flasha inre mjukvara"
 
@@ -810,10 +816,6 @@ msgstr "Säkerhetskopiera / Flasha inre mjukvara"
 msgid "Backup file list"
 msgstr "Säkerhetskopiera fillista"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Fel adress angiven!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -831,7 +833,7 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -851,7 +853,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr "Bithastighet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr ""
 
@@ -1040,10 +1042,11 @@ msgid "Close list..."
 msgstr "Stäng ner lista..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Samlar in data..."
 
@@ -1072,7 +1075,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Konfiguration"
@@ -1112,7 +1114,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Anslutningar"
 
@@ -1205,8 +1207,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr "DHCP-server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP och DNS"
 
@@ -1241,7 +1243,7 @@ msgstr "DHCPv6-tjänst"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr ""
 
@@ -1249,11 +1251,11 @@ msgstr ""
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1282,6 +1284,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1420,8 +1423,7 @@ msgstr "Enheten kan inte nås!"
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr ""
 
@@ -1480,7 +1482,7 @@ msgstr "Inaktiverad"
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
@@ -1514,7 +1516,7 @@ msgstr "Avståndsoptimering"
 msgid "Distance to farthest network member in meters."
 msgstr "Avstånd till nätverksmledlemmen längst bort i metrar."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1522,17 +1524,17 @@ msgid ""
 "firewalls"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr "Cachea inte negativa svar, t.ex för icke-existerade domäner"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Vidarebefordra inte förfrågningar som inte kan ta emot svar från publika "
 "namnservrar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1552,11 +1554,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Domän krävs"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Vitlista för domäner"
 
@@ -1564,7 +1566,7 @@ msgstr "Vitlista för domäner"
 msgid "Don't Fragment"
 msgstr "Fragmentera inte"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1707,7 +1709,7 @@ msgstr "Aktivera NTP-klient"
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Aktivera TFTP-server"
 
@@ -1827,11 +1829,11 @@ msgstr "Ethernet-adapter"
 msgid "Ethernet Switch"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr "Inkludera inte dessa gränssnitt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Expandera värdar"
 
@@ -1840,6 +1842,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1916,7 +1925,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1925,11 +1934,11 @@ msgstr ""
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Filtrera privata"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Filtrera icke-användbara"
 
@@ -1952,7 +1961,7 @@ msgstr "Hitta och anslut till nätverk"
 msgid "Finish"
 msgstr "Avsluta"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Brandvägg"
 
@@ -1976,7 +1985,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Version för inre mjukvara"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2104,7 +2113,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2143,9 +2152,9 @@ msgstr "Globala inställningar"
 msgid "Global network options"
 msgstr "Globala nätverksalternativ"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Gå till lösenordskonfiguration..."
@@ -2196,6 +2205,7 @@ msgstr "Göm <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2219,7 +2229,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2232,7 +2242,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "Värdnamn att skicka vid DHCP-förfrågningar"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Värdnamn"
 
@@ -2270,13 +2280,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2344,6 +2354,8 @@ msgstr "IPv4-i-IPv4 (RFC2003)"
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2354,8 +2366,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2425,6 +2435,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2516,7 +2527,7 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorera <code>/etc/hosts</code>"
 
@@ -2524,7 +2535,7 @@ msgstr "Ignorera <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Ignorera gränssnitt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Ignorera resolv-fil"
 
@@ -2576,10 +2587,6 @@ msgstr "Initskript"
 msgid "Initscripts"
 msgstr "Initskripten"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr "Installera iputils-traceroute6 för IPv6-traceroute"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Installera protokoll-förlängningar..."
@@ -2641,7 +2648,7 @@ msgstr "Gränssnittet är inte närvarande eller är inte anslutet än."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Gränssnitt"
 
@@ -2696,9 +2703,9 @@ msgid ""
 "flash memory, please verify the image file!"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "JavaScript krävs!"
@@ -2719,8 +2726,8 @@ msgstr "Ansluter till nätverk: %q"
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Kernel-logg"
 
@@ -2796,16 +2803,17 @@ msgstr "Latens"
 msgid "Leaf"
 msgstr "Löv"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "Kontraktstid"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Kontraktsfil"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2832,11 +2840,11 @@ msgstr ""
 msgid "Limit"
 msgstr "Begränsa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2860,7 +2868,7 @@ msgstr ""
 msgid "Link On"
 msgstr "Länk På"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2888,15 +2896,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr "Lista över SSH-nyckelfiler för auth"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2909,12 +2917,12 @@ msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 "Lyssna endast på det angivna gränssnittet eller, om o-specificerat på alla"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Lyssningsportar för ankommande DNS-förfrågningar"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Belastning"
 
@@ -2922,10 +2930,6 @@ msgstr "Belastning"
 msgid "Load Average"
 msgstr "Snitt-belastning"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Laddar"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -2958,7 +2962,7 @@ msgstr "Lokal IPv4-adress"
 msgid "Local IPv6 address"
 msgstr "Lokal IPv6-adress"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr "Enbart lokal tjänst"
 
@@ -2971,31 +2975,31 @@ msgstr "Lokal uppstart"
 msgid "Local Time"
 msgstr "Lokal tid"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Lokal domän"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Lokal server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Lokalisera förfrågningar"
 
@@ -3003,7 +3007,7 @@ msgstr "Lokalisera förfrågningar"
 msgid "Log output level"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr ""
 
@@ -3015,7 +3019,7 @@ msgstr "Loggning"
 msgid "Login"
 msgstr "Logga in"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Logga ut"
 
@@ -3112,15 +3116,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
@@ -3260,6 +3264,7 @@ msgstr "Monteringspunkt"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Monteringspunkter"
 
@@ -3351,11 +3356,10 @@ msgstr "Namn"
 msgid "Name of the new network"
 msgstr "Namnet på det nya nätverket"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Navigering"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3363,14 +3367,15 @@ msgstr "Navigering"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Nätverk"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Nätverksverktyg"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Uppstartsbild för nätverket"
 
@@ -3428,13 +3433,13 @@ msgstr "Ingen information tillgänglig"
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Ingen negativ cache"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Inget lösenord inställt!"
@@ -3480,7 +3485,7 @@ msgstr "Buller:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3522,11 +3527,11 @@ msgstr ""
 msgid "Notice"
 msgstr "Avisering"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3573,7 +3578,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "En utav värdnamn eller MAC-adress måste anges!"
 
@@ -3748,7 +3753,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Översikt"
 
@@ -3976,8 +3981,9 @@ msgstr ""
 msgid "Physical Settings"
 msgstr "Fysiska inställningar"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ping"
 
@@ -4053,7 +4059,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr "Förhindra lyssning på dessa gränssnitt."
 
@@ -4066,7 +4072,7 @@ msgid "Private Key"
 msgstr "Privat nyckel"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Processer"
 
@@ -4123,7 +4129,7 @@ msgstr "QMI-telefoni"
 msgid "Quality"
 msgstr "Kvalité"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4190,7 +4196,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4202,7 +4208,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "Verkligen byta protokoll?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Realtidsgrafer"
 
@@ -4210,12 +4216,13 @@ msgstr "Realtidsgrafer"
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Starta om"
 
@@ -4343,7 +4350,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4389,11 +4396,11 @@ msgstr "Återställ räknare"
 msgid "Reset to defaults"
 msgstr "Återställ till standard"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Resolv och Värd-filer"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Resolv-fil"
 
@@ -4445,7 +4452,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Root-mappen för filer som skickas via TFTP"
 
@@ -4471,12 +4478,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Router-lösenord"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Rutter"
 
@@ -4512,6 +4520,7 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH-åtkomst"
 
@@ -4529,6 +4538,7 @@ msgstr "Användarnamn för SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH-nycklar"
 
@@ -4573,6 +4583,7 @@ msgstr "Skanna"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Schemalagda uppgifter"
 
@@ -4612,7 +4623,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Server-inställningar"
 
@@ -4625,7 +4636,7 @@ msgstr "Namn på tjänst"
 msgid "Service Type"
 msgstr "Typ av tjänst"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Tjänster"
 
@@ -4716,7 +4727,7 @@ msgstr "Signal:"
 msgid "Size"
 msgstr "Storlek"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4729,11 +4740,11 @@ msgstr ""
 msgid "Skip"
 msgstr "Hoppa över"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Hoppa över till innehåll"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Hoppa över till navigering"
 
@@ -4834,6 +4845,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4845,11 +4857,11 @@ msgstr "Statiska IPv4-rutter"
 msgid "Static IPv6 Routes"
 msgstr "Statiska IPv6-rutter"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Statiska rutter"
 
@@ -4859,7 +4871,7 @@ msgstr "Statiska rutter"
 msgid "Static address"
 msgstr "Statiska adresser"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4870,10 +4882,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Status"
 
@@ -4883,7 +4895,7 @@ msgstr "Status"
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Strikt sortering"
 
@@ -4896,11 +4908,11 @@ msgstr ""
 msgid "Submit"
 msgstr "Skicka in"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4909,7 +4921,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Byt"
 
@@ -4957,15 +4969,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr "Synkronisera med webbläsare"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "System"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Systemlogg"
 
@@ -4981,11 +4994,11 @@ msgstr ""
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Inställningar för TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "Root för TFTP-server"
 
@@ -5203,7 +5216,8 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5213,9 +5227,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5236,7 +5250,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5269,7 +5283,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5339,14 +5353,15 @@ msgstr "Ton"
 msgid "Total Available"
 msgstr "Totalt tillgängligt"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Traceroute"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Trafik"
 
@@ -5574,7 +5589,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Upptid"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Använd <code>/etc/ethers</code>"
 
@@ -5685,7 +5700,7 @@ msgstr ""
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5734,7 +5749,7 @@ msgstr "VDSL"
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5812,10 +5827,6 @@ msgid ""
 "and ad-hoc mode) to be installed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "Väntar på att kommandot ska slutföras..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "Väntar på enheten..."
@@ -5851,9 +5862,9 @@ msgstr "Bredd"
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Trådlöst"
 
@@ -5901,7 +5912,7 @@ msgstr "Trådlöst nätverk är avstängt"
 msgid "Wireless network is enabled"
 msgstr "Trådlöst nätverk är aktiverat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Skriv mottagna DNS-förfrågningar till syslogg"
 
@@ -5927,9 +5938,9 @@ msgid ""
 "scripts like \"network\", your device might become inaccessible!</strong>"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -5953,7 +5964,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "något"
 
@@ -6042,13 +6053,14 @@ msgstr "inaktiverad"
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "slutade gälla"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6100,7 +6112,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "lokal <abbr title=\"Domain Name System\">DNS</abbr>-fil"
 
@@ -6137,16 +6149,16 @@ msgstr "inte tillgängligt"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "av"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "på"
@@ -6224,8 +6236,9 @@ msgstr ""
 msgid "unknown"
 msgstr "okänd"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6253,6 +6266,7 @@ msgid "untagged"
 msgstr "otaggat"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6265,6 +6279,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6293,6 +6308,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6352,6 +6368,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6377,6 +6396,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6424,6 +6444,18 @@ msgstr "ja"
 msgid "« Back"
 msgstr "« Bakåt"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Fel adress angiven!"
+
+#~ msgid "Install iputils-traceroute6 for IPv6 traceroute"
+#~ msgstr "Installera iputils-traceroute6 för IPv6-traceroute"
+
+#~ msgid "Loading"
+#~ msgstr "Laddar"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "Väntar på att kommandot ska slutföras..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Tilldela gränssnitten..."
 
diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index 7e6f95a23..ec0937e1b 100644
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -30,6 +30,8 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -136,15 +138,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -154,7 +156,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr ""
@@ -179,12 +181,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
@@ -192,28 +195,28 @@ msgstr ""
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
@@ -329,6 +332,7 @@ msgstr ""
 msgid "Active DHCP Leases"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr ""
@@ -384,7 +388,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
@@ -397,11 +401,11 @@ msgstr ""
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr ""
 
@@ -422,12 +426,13 @@ msgstr ""
 msgid "Address to access local relay bridge"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -456,17 +461,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -490,7 +495,7 @@ msgstr ""
 msgid "Allow listed only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr ""
 
@@ -506,7 +511,7 @@ msgstr ""
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -677,7 +682,7 @@ msgstr ""
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr ""
 
@@ -685,11 +690,11 @@ msgstr ""
 msgid "Authorization Required"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -783,6 +788,7 @@ msgid "Backup"
 msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -791,10 +797,6 @@ msgstr ""
 msgid "Backup file list"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr ""
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -812,7 +814,7 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -832,7 +834,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr ""
 
@@ -1018,10 +1020,11 @@ msgid "Close list..."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr ""
 
@@ -1050,7 +1053,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr ""
@@ -1090,7 +1092,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr ""
 
@@ -1183,8 +1185,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr ""
 
@@ -1219,7 +1221,7 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr ""
 
@@ -1227,11 +1229,11 @@ msgstr ""
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1260,6 +1262,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1398,8 +1401,7 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr ""
 
@@ -1456,7 +1458,7 @@ msgstr ""
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
@@ -1490,7 +1492,7 @@ msgstr ""
 msgid "Distance to farthest network member in meters."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1498,15 +1500,15 @@ msgid ""
 "firewalls"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1526,11 +1528,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr ""
 
@@ -1538,7 +1540,7 @@ msgstr ""
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1679,7 +1681,7 @@ msgstr ""
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr ""
 
@@ -1799,11 +1801,11 @@ msgstr ""
 msgid "Ethernet Switch"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr ""
 
@@ -1812,6 +1814,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1888,7 +1897,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1897,11 +1906,11 @@ msgstr ""
 msgid "Filesystem"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr ""
 
@@ -1924,7 +1933,7 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr ""
 
@@ -1948,7 +1957,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2076,7 +2085,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2115,9 +2124,9 @@ msgstr ""
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr ""
@@ -2168,6 +2177,7 @@ msgstr ""
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2191,7 +2201,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2204,7 +2214,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr ""
 
@@ -2242,13 +2252,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
@@ -2316,6 +2326,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2326,8 +2338,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr ""
@@ -2397,6 +2407,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2488,7 +2499,7 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
@@ -2496,7 +2507,7 @@ msgstr ""
 msgid "Ignore interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr ""
 
@@ -2548,10 +2559,6 @@ msgstr ""
 msgid "Initscripts"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr ""
@@ -2613,7 +2620,7 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr ""
 
@@ -2668,9 +2675,9 @@ msgid ""
 "flash memory, please verify the image file!"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr ""
@@ -2691,8 +2698,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr ""
 
@@ -2768,16 +2775,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2804,11 +2812,11 @@ msgstr ""
 msgid "Limit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2832,7 +2840,7 @@ msgstr ""
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2860,15 +2868,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2880,12 +2888,12 @@ msgstr ""
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr ""
 
@@ -2893,10 +2901,6 @@ msgstr ""
 msgid "Load Average"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -2929,7 +2933,7 @@ msgstr ""
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -2942,31 +2946,31 @@ msgstr ""
 msgid "Local Time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr ""
 
@@ -2974,7 +2978,7 @@ msgstr ""
 msgid "Log output level"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr ""
 
@@ -2986,7 +2990,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr ""
 
@@ -3083,15 +3087,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
@@ -3231,6 +3235,7 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -3322,11 +3327,10 @@ msgstr ""
 msgid "Name of the new network"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3334,14 +3338,15 @@ msgstr ""
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr ""
 
@@ -3399,13 +3404,13 @@ msgstr ""
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr ""
@@ -3451,7 +3456,7 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3493,11 +3498,11 @@ msgstr ""
 msgid "Notice"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3544,7 +3549,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
@@ -3719,7 +3724,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr ""
 
@@ -3947,8 +3952,9 @@ msgstr ""
 msgid "Physical Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4024,7 +4030,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4037,7 +4043,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr ""
 
@@ -4094,7 +4100,7 @@ msgstr ""
 msgid "Quality"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4161,7 +4167,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4171,7 +4177,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr ""
 
@@ -4179,12 +4185,13 @@ msgstr ""
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr ""
 
@@ -4312,7 +4319,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4358,11 +4365,11 @@ msgstr ""
 msgid "Reset to defaults"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr ""
 
@@ -4414,7 +4421,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4440,12 +4447,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr ""
 
@@ -4481,6 +4489,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4498,6 +4507,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4542,6 +4552,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr ""
 
@@ -4581,7 +4592,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr ""
 
@@ -4594,7 +4605,7 @@ msgstr ""
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr ""
 
@@ -4685,7 +4696,7 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4698,11 +4709,11 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr ""
 
@@ -4803,6 +4814,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4814,11 +4826,11 @@ msgstr ""
 msgid "Static IPv6 Routes"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr ""
 
@@ -4828,7 +4840,7 @@ msgstr ""
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4839,10 +4851,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr ""
 
@@ -4852,7 +4864,7 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr ""
 
@@ -4865,11 +4877,11 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4878,7 +4890,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr ""
 
@@ -4926,15 +4938,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr ""
 
@@ -4950,11 +4963,11 @@ msgstr ""
 msgid "TCP:"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr ""
 
@@ -5172,7 +5185,8 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5182,9 +5196,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5203,7 +5217,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5236,7 +5250,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5304,14 +5318,15 @@ msgstr ""
 msgid "Total Available"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr ""
 
@@ -5539,7 +5554,7 @@ msgstr ""
 msgid "Uptime"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr ""
 
@@ -5650,7 +5665,7 @@ msgstr ""
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5699,7 +5714,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5777,10 +5792,6 @@ msgid ""
 "and ad-hoc mode) to be installed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr ""
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5815,9 +5826,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr ""
 
@@ -5865,7 +5876,7 @@ msgstr ""
 msgid "Wireless network is enabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
@@ -5891,9 +5902,9 @@ msgid ""
 "scripts like \"network\", your device might become inaccessible!</strong>"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -5915,7 +5926,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr ""
 
@@ -6004,13 +6015,14 @@ msgstr ""
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6062,7 +6074,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 
@@ -6099,16 +6111,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr ""
@@ -6186,8 +6198,9 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6215,6 +6228,7 @@ msgid "untagged"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6227,6 +6241,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6255,6 +6270,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6314,6 +6330,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6339,6 +6358,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po
index 329357ae1..4419e66d0 100644
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -44,6 +44,8 @@ msgstr "(%d dakika gösteriliyor, %d saniye aralıklı)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -151,15 +153,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Alan Adı Sistemi\">DNS</abbr> port sorgula"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Alan Adı Sistemi\">DNS</abbr> sunucu port"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -169,7 +171,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protokolü Sürüm 4\">IPv4</abbr>-Adres"
@@ -196,12 +198,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protokolü Sürüm 6\">IPv6</abbr>-Gateway"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Ayarları"
 
@@ -209,16 +212,16 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Ayarları"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Adı"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Adresi"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -226,7 +229,7 @@ msgstr ""
 "<abbr title=\"maximal\">Maks.</abbr> <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr> leases"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -234,7 +237,7 @@ msgstr ""
 "<abbr title=\"maximal\">Maks.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> paket boyutu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Maks.</abbr> eşzamanlı sorgu"
 
@@ -353,6 +356,7 @@ msgstr "Aktif Bağlantılar"
 msgid "Active DHCP Leases"
 msgstr "Aktif DHCP Kiraları"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 #, fuzzy
 msgid "Active DHCPv6 Leases"
@@ -409,7 +413,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
@@ -422,11 +426,11 @@ msgstr "Yeni arabirim ekle..."
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Ek Hosts dosyaları"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "Ek sunucular dosyası"
 
@@ -447,12 +451,13 @@ msgstr "Adres"
 msgid "Address to access local relay bridge"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -481,17 +486,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -518,7 +523,7 @@ msgstr "Eski 802.11b oranlarına izin ver"
 msgid "Allow listed only"
 msgstr "Yanlızca listelenenlere izin ver"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr ""
 
@@ -536,7 +541,7 @@ msgstr ""
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -707,7 +712,7 @@ msgstr "Kimlik Doğrulama"
 msgid "Authentication Type"
 msgstr "Kimlik doğrulama türü"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Yetkilendirme"
 
@@ -715,11 +720,11 @@ msgstr "Yetkilendirme"
 msgid "Authorization Required"
 msgstr "Yetkilendirme Gerekli"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -813,6 +818,7 @@ msgid "Backup"
 msgstr "Yedekleme"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Yedek/Firmware Yazma"
 
@@ -821,10 +827,6 @@ msgstr "Yedek/Firmware Yazma"
 msgid "Backup file list"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr ""
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -842,7 +844,7 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -862,7 +864,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr "Bit hızı"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr ""
 
@@ -1050,10 +1052,11 @@ msgid "Close list..."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Veri alınıyor..."
 
@@ -1082,7 +1085,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr ""
@@ -1122,7 +1124,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Bağlantılar"
 
@@ -1215,8 +1217,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr ""
 
@@ -1251,7 +1253,7 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr ""
 
@@ -1259,11 +1261,11 @@ msgstr ""
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1292,6 +1294,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1430,8 +1433,7 @@ msgstr "Cihaz ulaşılamaz!"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "Cihaz ulaşılamaz! Hala cihazı bekliyorum..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Tanı"
 
@@ -1490,7 +1492,7 @@ msgstr "Devre dışı"
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
@@ -1524,7 +1526,7 @@ msgstr "Mesafe Optimizasyonu"
 msgid "Distance to farthest network member in meters."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1532,15 +1534,15 @@ msgid ""
 "firewalls"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
@@ -1560,11 +1562,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr ""
 
@@ -1572,7 +1574,7 @@ msgstr ""
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1713,7 +1715,7 @@ msgstr ""
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr ""
 
@@ -1833,11 +1835,11 @@ msgstr ""
 msgid "Ethernet Switch"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr ""
 
@@ -1846,6 +1848,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1922,7 +1931,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1931,11 +1940,11 @@ msgstr ""
 msgid "Filesystem"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr ""
 
@@ -1958,7 +1967,7 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr ""
 
@@ -1982,7 +1991,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Firmware Versiyon"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2110,7 +2119,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2149,9 +2158,9 @@ msgstr ""
 msgid "Global network options"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr ""
@@ -2202,6 +2211,7 @@ msgstr ""
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2225,7 +2235,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2238,7 +2248,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr ""
 
@@ -2276,13 +2286,13 @@ msgstr ""
 msgid "IP address is missing"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
@@ -2350,6 +2360,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2360,8 +2372,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr ""
@@ -2431,6 +2441,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2522,7 +2533,7 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
@@ -2530,7 +2541,7 @@ msgstr ""
 msgid "Ignore interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr ""
 
@@ -2582,10 +2593,6 @@ msgstr ""
 msgid "Initscripts"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr ""
@@ -2647,7 +2654,7 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr ""
 
@@ -2702,9 +2709,9 @@ msgid ""
 "flash memory, please verify the image file!"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr ""
@@ -2725,8 +2732,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr ""
 
@@ -2802,16 +2809,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2838,11 +2846,11 @@ msgstr ""
 msgid "Limit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2866,7 +2874,7 @@ msgstr ""
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2894,15 +2902,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2914,12 +2922,12 @@ msgstr ""
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr ""
 
@@ -2927,10 +2935,6 @@ msgstr ""
 msgid "Load Average"
 msgstr "Ortalama Yük"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Yükleniyor"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -2963,7 +2967,7 @@ msgstr ""
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -2976,31 +2980,31 @@ msgstr ""
 msgid "Local Time"
 msgstr "Yerel Zaman"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr ""
 
@@ -3008,7 +3012,7 @@ msgstr ""
 msgid "Log output level"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr ""
 
@@ -3020,7 +3024,7 @@ msgstr ""
 msgid "Login"
 msgstr "Oturum Aç"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Oturumu Kapat"
 
@@ -3117,15 +3121,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
@@ -3265,6 +3269,7 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -3356,11 +3361,10 @@ msgstr ""
 msgid "Name of the new network"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3368,14 +3372,15 @@ msgstr ""
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Ağ"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr ""
 
@@ -3433,13 +3438,13 @@ msgstr ""
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr ""
@@ -3485,7 +3490,7 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3527,11 +3532,11 @@ msgstr ""
 msgid "Notice"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
@@ -3578,7 +3583,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
@@ -3753,7 +3758,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Genel Bakış"
 
@@ -3981,8 +3986,9 @@ msgstr ""
 msgid "Physical Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4058,7 +4064,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4071,7 +4077,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr ""
 
@@ -4128,7 +4134,7 @@ msgstr ""
 msgid "Quality"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4195,7 +4201,7 @@ msgstr ""
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4205,7 +4211,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr ""
 
@@ -4213,12 +4219,13 @@ msgstr ""
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Yeniden başlat"
 
@@ -4346,7 +4353,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4392,11 +4399,11 @@ msgstr "Sayaçları Sıfırla"
 msgid "Reset to defaults"
 msgstr "Varsayılanlara dön"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr ""
 
@@ -4448,7 +4455,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4474,12 +4481,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Yönlendirici Parolası"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Yönlendirmeler"
 
@@ -4515,6 +4523,7 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH Erişimi"
 
@@ -4532,6 +4541,7 @@ msgstr "SSH kullanıcı adı"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH-Anahtarları"
 
@@ -4577,6 +4587,7 @@ msgstr "Tara"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Zamanlanmış Görevler"
 
@@ -4616,7 +4627,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr ""
 
@@ -4629,7 +4640,7 @@ msgstr ""
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Servisler"
 
@@ -4720,7 +4731,7 @@ msgstr "Sinyal:"
 msgid "Size"
 msgstr "Boyut"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr ""
 
@@ -4733,11 +4744,11 @@ msgstr ""
 msgid "Skip"
 msgstr "Atla"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr ""
 
@@ -4838,6 +4849,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4849,11 +4861,11 @@ msgstr ""
 msgid "Static IPv6 Routes"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr ""
 
@@ -4863,7 +4875,7 @@ msgstr ""
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4874,10 +4886,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Durum"
 
@@ -4887,7 +4899,7 @@ msgstr "Durum"
 msgid "Stop"
 msgstr "Durdur"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr ""
 
@@ -4900,11 +4912,11 @@ msgstr ""
 msgid "Submit"
 msgstr "Gönder"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4913,7 +4925,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr ""
 
@@ -4961,15 +4973,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistem"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr ""
 
@@ -4985,11 +4998,11 @@ msgstr ""
 msgid "TCP:"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr ""
 
@@ -5207,7 +5220,8 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5217,9 +5231,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5238,7 +5252,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5271,7 +5285,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5339,14 +5353,15 @@ msgstr ""
 msgid "Total Available"
 msgstr "Toplam Mevcut"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr ""
 
@@ -5574,7 +5589,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Çalışma Zamanı"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr ""
 
@@ -5685,7 +5700,7 @@ msgstr "Ağ geçidi metriğini kullan"
 msgid "Use routing table"
 msgstr "Yönlendirme tablosunu kullan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5734,7 +5749,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5812,10 +5827,6 @@ msgid ""
 "and ad-hoc mode) to be installed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr ""
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr ""
@@ -5850,9 +5861,9 @@ msgstr "Genişlik"
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Kablosuz"
 
@@ -5900,7 +5911,7 @@ msgstr ""
 msgid "Wireless network is enabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
@@ -5926,9 +5937,9 @@ msgid ""
 "scripts like \"network\", your device might become inaccessible!</strong>"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -5952,7 +5963,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "herhangi"
 
@@ -6041,13 +6052,14 @@ msgstr "devre dışı"
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "sona ermiş"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6099,7 +6111,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "yerel <abbr title=\"Domain Name System\">DNS</abbr> dosyası"
 
@@ -6136,16 +6148,16 @@ msgstr "mevcut değil"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "kapalı"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "açık"
@@ -6223,8 +6235,9 @@ msgstr ""
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6252,6 +6265,7 @@ msgid "untagged"
 msgstr "etiketsiz"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6264,6 +6278,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6292,6 +6307,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6351,6 +6367,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6376,6 +6395,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6423,6 +6443,9 @@ msgstr "evet"
 msgid "« Back"
 msgstr "« Geri"
 
+#~ msgid "Loading"
+#~ msgstr "Yükleniyor"
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Arabirim ata..."
 
diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po
index 31191bdad..1a103c86b 100644
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -42,6 +42,8 @@ msgstr "(вікно – %d хв, інтервал – %d с)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -152,19 +154,19 @@ msgstr ""
 "<abbr title=\"Basic Service Set Identifier — ідентифікатор основної служби "
 "послуг\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 "Порт <abbr title=\"Domain Name System — система доменних імен\">DNS</abbr>-"
 "запиту"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr ""
 "Порт <abbr title=\"Domain Name System — система доменних імен\">DNS</abbr>-"
 "сервера"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -178,7 +180,7 @@ msgstr ""
 "<abbr title=\"Extended Service Set Identifier — ідентифікатор розширеної "
 "служби послуг\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Інтернет-протокол версії 4\">IPv4</abbr>-адреса"
@@ -205,12 +207,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Інтернет-протокол версії 6\">IPv6</abbr>-шлюз"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr "<abbr title=\"Інтернет-протокол версії 6\">IPv6</abbr>-суфікс (hex)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 "Налаштування <abbr title=\"Light Emitting Diode — світлодіод\">LED</abbr>"
@@ -219,18 +222,18 @@ msgstr ""
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Назва <abbr title=\"Light Emitting Diode — світлодіод\">LED</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 "<abbr title=\"Media Access Control — управління доступом до носія\">MAC</"
 "abbr>-адреса"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr "<abbr title=\"Унікальний ідентифікатор DHCP\">DUID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -238,7 +241,7 @@ msgstr ""
 "<abbr title=\"Максимум\">Макс.</abbr> оренд <abbr title=\"Dynamic Host "
 "Configuration Protocol — протокол динамічної конфігурації вузла\">DHCP</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -247,7 +250,7 @@ msgstr ""
 "\"Extension Mechanisms for Domain Name System — Механізми розширень для "
 "доменної системи імен\">EDNS0</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"Максимум\">Макс.</abbr> одночасних запитів"
 
@@ -376,6 +379,7 @@ msgstr "Активні підключення"
 msgid "Active DHCP Leases"
 msgstr "Активні оренди DHCP"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Активні оренди DHCPv6"
@@ -431,7 +435,7 @@ msgstr "Додати реалізацію"
 msgid "Add key"
 msgstr "Додати ключ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Додавати суфікс локального домену до імен, отриманих із файлів hosts"
 
@@ -444,11 +448,11 @@ msgstr "Додати новий інтерфейс..."
 msgid "Add peer"
 msgstr "Додати вузол"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Додаткові файли hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "Додаткові файли servers"
 
@@ -469,12 +473,13 @@ msgstr "Адреса"
 msgid "Address to access local relay bridge"
 msgstr "Адреса для доступу до мосту локального ретранслятора"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Адміністрування"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -503,17 +508,17 @@ msgstr "Інтерфейс псевдоніма"
 msgid "Alias of \"%s\""
 msgstr "Псевдонім \"%s\""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr "Усі сервери"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr "Виділяти IP-адреси послідовно, починаючи з найнижчої доступної адреси"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr "Виділяти IP послідовно"
 
@@ -542,7 +547,7 @@ msgstr "Дозволяти застарілі швидк. 802.11b"
 msgid "Allow listed only"
 msgstr "Дозволити тільки зазначені"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Дозволити локальний вузол"
 
@@ -560,7 +565,7 @@ msgstr "Дозволити root-вхід із паролем"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Дозволити користувачеві <em>root</em> вхід до системи з паролем"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
@@ -743,7 +748,7 @@ msgstr "Автентифікація"
 msgid "Authentication Type"
 msgstr "Тип автентифікації"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Надійний"
 
@@ -751,11 +756,11 @@ msgstr "Надійний"
 msgid "Authorization Required"
 msgstr "Потрібна авторизація"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -850,6 +855,7 @@ msgid "Backup"
 msgstr "Резервне копіювання"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Рез. копіювання / Перепрош."
 
@@ -858,10 +864,6 @@ msgstr "Рез. копіювання / Перепрош."
 msgid "Backup file list"
 msgstr "Список файлів резервних копій"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Вказано неправильну адресу!"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -882,7 +884,7 @@ msgstr ""
 "складається із позначених opkg змінених файлів конфігурації, невідокремних "
 "базових файлів, та файлів за користувацькими шаблонами резервного копіювання."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -904,7 +906,7 @@ msgstr "Прив'язка тунелю до цього інтерфейсу (з�
 msgid "Bitrate"
 msgstr "Швидкість потоку"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Відкидати підробки NX-домену"
 
@@ -1103,10 +1105,11 @@ msgid "Close list..."
 msgstr "Згорнути список..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Збирання даних..."
 
@@ -1139,7 +1142,6 @@ msgstr ""
 "особливо в середовищах з великою завантаженістю трафіку."
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Конфігурація"
@@ -1179,7 +1181,7 @@ msgstr "Невдала спроба підключення"
 msgid "Connection lost"
 msgstr "З'єднання втрачено"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Підключення"
 
@@ -1281,8 +1283,8 @@ msgstr "Секрет DAE"
 msgid "DHCP Server"
 msgstr "Сервер DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP та DNS"
 
@@ -1317,7 +1319,7 @@ msgstr "Служба DHCPv6"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "Переспрямовування<br />запитів DNS"
 
@@ -1325,11 +1327,11 @@ msgstr "Переспрямовування<br />запитів DNS"
 msgid "DNS-Label / FQDN"
 msgstr "DNS-мітка / FQDN"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr "Перевірка непідписаного DNSSEC"
 
@@ -1360,6 +1362,7 @@ msgstr ""
 "Інтервал <abbr title=\"Delivery Traffic Indication Message — Повідомлення "
 "індикації доправлення трафіку\">DTIM</abbr>"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1501,8 +1504,7 @@ msgstr "Пристрій недосяжний!"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "Пристрій недосяжний! Досі чекаємо на пристрій..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Діагностика"
 
@@ -1561,7 +1563,7 @@ msgstr "Вимкнено"
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Роз'єднувати за низького підтвердження"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Відкидати висхідні RFC1918-відповіді"
 
@@ -1595,7 +1597,7 @@ msgstr "Оптимізація за відстанню"
 msgid "Distance to farthest network member in meters."
 msgstr "Відстань до найвіддаленішого вузла мережі в метрах."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1608,17 +1610,17 @@ msgstr ""
 "для брандмауерів <abbr title=\"Network Address Translation — перетворення "
 "(трансляція) мережевих адрес\">NAT</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr "Не кешувати негативні відповіді, наприклад, за неіснуючих доменів"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Не переспрямовувати запити, які не може бути оброблено відкритими серверами "
 "імен"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 "Не переспрямовувати зворотні <abbr title=\"Domain Name System — система "
@@ -1640,11 +1642,11 @@ msgstr "Справді стерти всі налаштування?"
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr "Справді рекурсивно видалити каталог \"%s\"?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Потрібен домен"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "\"Білий список\" доменів"
 
@@ -1652,7 +1654,7 @@ msgstr "\"Білий список\" доменів"
 msgid "Don't Fragment"
 msgstr "Не фрагментувати"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1806,7 +1808,7 @@ msgstr "Увімкнути клієнта NTP"
 msgid "Enable Single DES"
 msgstr "Увімкнути Single DES"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Увімкнути TFTP-сервер"
 
@@ -1929,11 +1931,11 @@ msgstr "Ethernet-адаптер"
 msgid "Ethernet Switch"
 msgstr "Ethernet-комутатор"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr "Виключити інтерфейси"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Розширення вузлів"
 
@@ -1942,6 +1944,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr "Очікується шістнадцятковий натяк призначення"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr "Очікування: %s"
 
@@ -2018,7 +2027,7 @@ msgstr "Файл недоступний"
 msgid "Filename"
 msgstr "Ім'я файлу"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "І'мя завантажувального образу, що оголошується клієнтам"
 
@@ -2027,11 +2036,11 @@ msgstr "І'мя завантажувального образу, що оголо
 msgid "Filesystem"
 msgstr "Файлова система"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Фільтрувати приватні"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Фільтрувати непридатні"
 
@@ -2056,7 +2065,7 @@ msgstr "Знайти мережу й приєднатися"
 msgid "Finish"
 msgstr "Готово"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Брандмауер"
 
@@ -2080,7 +2089,7 @@ msgstr "Файл мікропрограми"
 msgid "Firmware Version"
 msgstr "Версія мікропрограми"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Фіксований порт для вихідних DNS-запитів"
 
@@ -2210,7 +2219,7 @@ msgstr "Неприпустима адреса шлюзу"
 msgid "Gateway metric"
 msgstr "Метрика шлюзу"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2249,9 +2258,9 @@ msgstr "Загальні параметри"
 msgid "Global network options"
 msgstr "Глобальні параметри мережі"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Перейти до конфігурації пароля..."
@@ -2308,6 +2317,7 @@ msgstr ""
 msgid "Hide empty chains"
 msgstr "Приховати порожні ланцюжки"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2331,7 +2341,7 @@ msgid "Host-Uniq tag content"
 msgstr "Зміст тегу Host-Uniq"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2344,7 +2354,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "Ім'я вузла для надсилання при запиті DHCP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Імена вузлів"
 
@@ -2382,13 +2392,13 @@ msgstr "Неприпустима IP-адреса"
 msgid "IP address is missing"
 msgstr "Відсутня IP-адреса"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2456,6 +2466,8 @@ msgstr "IPv4 у IPv4 (RFC2003)"
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr "IPv4/IPv6 (обидва - типово для IPv4)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2466,8 +2478,6 @@ msgstr "IPv4/IPv6 (обидва - типово для IPv4)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2539,6 +2549,7 @@ msgstr "Надісланий префікс IPv6"
 msgid "IPv6 suffix"
 msgstr "Суфікс IPv6"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2640,7 +2651,7 @@ msgstr ""
 "своп-пристрої не можуть бути доступні з такою високою швидкістю, як <abbr "
 "title=\"Random Access Memory\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ігнорувати <code>/etc/hosts</code>"
 
@@ -2648,7 +2659,7 @@ msgstr "Ігнорувати <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Ігнорувати интерфейс"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Ігнорувати файли resolv"
 
@@ -2703,10 +2714,6 @@ msgstr "Скрипт ініціалізації"
 msgid "Initscripts"
 msgstr "Скрипти ініціалізації"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr "Інсталюйте iputils-traceroute6 для трасування IPv6"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Інсталяція розширень протоколу..."
@@ -2768,7 +2775,7 @@ msgstr "Інтерфейс відсутній або його ще не підк
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Інтерфейси"
 
@@ -2828,9 +2835,9 @@ msgstr ""
 "Схоже, що ви намагаєтеся прошити образ, який не вміщається до флеш-пам'яті! "
 "Перевірте файл образу!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "Потрібен JavaScript!"
@@ -2851,8 +2858,8 @@ msgstr "Приєднання до мережі: %q"
 msgid "Keep settings and retain the current configuration"
 msgstr "Зберегти налаштування та поточну конфігурацію"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Журнал ядра"
 
@@ -2928,16 +2935,17 @@ msgstr "Затримка"
 msgid "Leaf"
 msgstr "Лист"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "Час оренди"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Файл оренд"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2964,12 +2972,12 @@ msgstr "Легенда:"
 msgid "Limit"
 msgstr "Межа"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 "Обмежувати службу DNS інтерфейсами підмереж, на яких ми обслуговуємо DNS."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 "Обмежитися прослуховуванням цих інтерфейсів і повернутися до початку циклу."
@@ -2994,7 +3002,7 @@ msgstr "Час безперервної роботи лінії"
 msgid "Link On"
 msgstr "Зв'язок встановлено"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -3040,15 +3048,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr "Список файлів SSH-ключів для авторизації"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Список доменів, для яких дозволено RFC1918-відповіді"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "Список доменів, які підтримують результати підробки NX-доменів"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr "Інтерфейси прослуховування"
 
@@ -3062,12 +3070,12 @@ msgstr ""
 "Прослуховувати тільки на цьому інтерфейсі, якщо <em>не визначено</em> – на "
 "всіх"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Порт прослуховування для вхідних DNS-запитів"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Навантаження"
 
@@ -3075,10 +3083,6 @@ msgstr "Навантаження"
 msgid "Load Average"
 msgstr "Середнє навантаження"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Завантаження"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr "Завантаження вмісту каталогу…"
@@ -3111,7 +3115,7 @@ msgstr "Локальна адреса IPv4"
 msgid "Local IPv6 address"
 msgstr "Локальна адреса IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr "Тільки локальна служба"
 
@@ -3124,11 +3128,11 @@ msgstr "Локальний запуск"
 msgid "Local Time"
 msgstr "Місцевий час"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Локальний домен"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3137,17 +3141,17 @@ msgstr ""
 "не пересилаються і вирізняються тільки з файлу DHCP (/etc/config/dhcp) або "
 "файлу hosts (/etc/hosts)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 "Суфікс локального домену додається до DHCP-імен вузлів та записів з файлу "
 "hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "Локальний сервер"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3155,7 +3159,7 @@ msgstr ""
 "Локалізувати ім'я хоста залежно від запитуючої підмережі, якщо доступно "
 "кілька IP-адрес"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Локалізувати запити"
 
@@ -3163,7 +3167,7 @@ msgstr "Локалізувати запити"
 msgid "Log output level"
 msgstr "Рівень виведення інформаціі до журналу"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Журнал запитів"
 
@@ -3175,7 +3179,7 @@ msgstr "Журналювання"
 msgid "Login"
 msgstr "Увійти"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Вийти"
 
@@ -3276,15 +3280,15 @@ msgstr "Макс. досяжна швидкість передачі даних
 msgid "Maximum allowed Listen Interval"
 msgstr "Максимальний дозволений інтервал прослуховування"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Максимально допустима кількість активних оренд DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Максимально допустима кількість одночасних DNS-запитів"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Максимально допустимий розмір UDP-пакетів EDNS.0"
 
@@ -3424,6 +3428,7 @@ msgstr "Точка монтування"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Точки монтування"
 
@@ -3517,11 +3522,10 @@ msgstr "Ім'я"
 msgid "Name of the new network"
 msgstr "Назва нової мережі"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Навігація"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3529,14 +3533,15 @@ msgstr "Навігація"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Мережа"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Мережеві утиліти"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Образ для мережевого завантаження"
 
@@ -3594,13 +3599,13 @@ msgstr "Інформація відсутня"
 msgid "No matching prefix delegation"
 msgstr "Делегування відповідних префіксів відсутнє"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Ніяких негативних кешувань"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Пароль не встановлено!"
@@ -3646,7 +3651,7 @@ msgstr "Шум:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "Не запобіжні помилки CRC (CRC_P)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr "Без шаблону заміни"
 
@@ -3688,11 +3693,11 @@ msgstr "Не підтримується"
 msgid "Notice"
 msgstr "Зауваження"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "DNS-запит"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr "Кількість кешованих записів DNS (макс. – 10000, 0 – без кешування)"
 
@@ -3739,7 +3744,7 @@ msgstr "Маршрут On-Link"
 msgid "On-State Delay"
 msgstr "Затримка On-State"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "Має бути зазначено одне з двох – ім'я вузла або МАС-адреса!"
 
@@ -3932,7 +3937,7 @@ msgid "Override the table used for internal routes"
 msgstr ""
 "Перевизначення таблиці, що використовужться для внутрішніх спрямовувань"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Огляд"
 
@@ -4162,8 +4167,9 @@ msgstr "Фізична швидкість:"
 msgid "Physical Settings"
 msgstr "Фізичні параметри"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ехо-запит"
 
@@ -4241,7 +4247,7 @@ msgstr ""
 "Вважати вузол недоступним після визначеної кількості невдач отримання ехо-"
 "пакета LCP, використовуйте 0, щоб ігнорувати невдачі"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr "Перешкоджати прослуховуванню цих інтерфейсів."
 
@@ -4254,7 +4260,7 @@ msgid "Private Key"
 msgstr "Приватний ключ"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Процеси"
 
@@ -4315,7 +4321,7 @@ msgstr "Стільниковий QMI"
 msgid "Quality"
 msgstr "Якість"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4386,7 +4392,7 @@ msgstr ""
 "Необроблені байти в шістнадцятковому кодуванні. Залиште порожнім, якщо ваш "
 "інтернет-провайдер не вимагає цього."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4399,7 +4405,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "Дійсно змінити протокол?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Графіки у реальному часі"
 
@@ -4407,12 +4413,13 @@ msgstr "Графіки у реальному часі"
 msgid "Reassociation Deadline"
 msgstr "Кінцевий термін реассоціації"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "Захист від переприв'язки"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Перезавантаження"
 
@@ -4545,7 +4552,7 @@ msgstr ""
 "Потребує \"повної\" версії wpad/hostapd та підтримки драйвером WiFi <br /"
 ">(станом на січень 2019 року: ath9k, ath10k, mwlwifi та mt76)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4593,11 +4600,11 @@ msgstr "Скинути лічильники"
 msgid "Reset to defaults"
 msgstr "Відновити початковий стан"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Файли resolv і hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Файл resolv"
 
@@ -4649,7 +4656,7 @@ msgstr "Помилка запиту на скасування зі статус�
 msgid "Reverting configuration…"
 msgstr "Відкат конфігурації…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Кореневий каталог для файлів TFTP"
 
@@ -4675,12 +4682,13 @@ msgstr "Служба оголошень маршрутизатора"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Пароль маршрутизатора"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Маршрути"
 
@@ -4718,6 +4726,7 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH-доступ"
 
@@ -4735,6 +4744,7 @@ msgstr "Ім'я користувача SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH-ключі"
 
@@ -4779,6 +4789,7 @@ msgstr "Сканувати"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Заплановані завдання"
 
@@ -4823,7 +4834,7 @@ msgstr ""
 "Надсилати ехо-пакети LCP зі вказаним інтервалом (секунди), ефективно тільки "
 "в поєднанні з порогом помилок"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Налаштування сервера"
 
@@ -4836,7 +4847,7 @@ msgstr "Назва сервісу"
 msgid "Service Type"
 msgstr "Тип сервісу"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Сервіси"
 
@@ -4931,7 +4942,7 @@ msgstr "Сигнал:"
 msgid "Size"
 msgstr "Розмір"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr "Розмір кешу запитів DNS"
 
@@ -4944,11 +4955,11 @@ msgstr "Розмір пристрою ZRam у мегабайтах"
 msgid "Skip"
 msgstr "Пропустити"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Перейти до вмісту"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Перейти до навігації"
 
@@ -5063,6 +5074,7 @@ msgstr "Розпочато сканування бездротових мере�
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Запуск"
 
@@ -5074,11 +5086,11 @@ msgstr "Статичні маршрути IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Статичні маршрути IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Статичні оренди"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Статичні маршрути"
 
@@ -5088,7 +5100,7 @@ msgstr "Статичні маршрути"
 msgid "Static address"
 msgstr "Статична адреса"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -5103,10 +5115,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr "Обмеження бездіяльності станції"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Стан"
 
@@ -5116,7 +5128,7 @@ msgstr "Стан"
 msgid "Stop"
 msgstr "Зупинити"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Строгий порядок"
 
@@ -5129,11 +5141,11 @@ msgstr "Висока"
 msgid "Submit"
 msgstr "Надіслати"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr "Блокувати журналювання"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Блокувати ведення журналу звичайної роботи цих протоколів"
 
@@ -5142,7 +5154,7 @@ msgid "Swap free"
 msgstr "Вільно свопу"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Комутатор"
 
@@ -5192,15 +5204,16 @@ msgstr "Синхронізувати з NTP-сервером"
 msgid "Sync with browser"
 msgstr "Синхронізувати з браузером"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Система"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Системний журнал"
 
@@ -5216,11 +5229,11 @@ msgstr "Розмір буфера системного журналу"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Налаштування TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "Корінь TFTP-сервера"
 
@@ -5480,7 +5493,8 @@ msgstr ""
 "Відвантажений файл образу не містить підтримуваний формат. Переконайтеся, що "
 "ви вибираєте універсальний формат образу для вашої платформи."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5490,9 +5504,9 @@ msgstr "Немає жодних активних оренд"
 msgid "There are no changes to apply"
 msgstr "Немає жодних змін до застосування"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5513,7 +5527,7 @@ msgstr "Цей тип автентифікації не застосовуєть
 msgid "This does not look like a valid PEM file"
 msgstr "Це не схоже на дійсний файл PEM"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5558,7 +5572,7 @@ msgstr ""
 "Це локальна адреса кінцевого вузла, яку присвоєно тунельним брокером, вона "
 "зазвичай закінчується на <code>…:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5638,14 +5652,15 @@ msgstr "Тоновий"
 msgid "Total Available"
 msgstr "Усього доступно"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Трасування"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "Трафік"
 
@@ -5878,7 +5893,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Час безперервної роботи"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Використовувати <code>/etc/ethers</code>"
 
@@ -5989,7 +6004,7 @@ msgstr "Використовувати метрику шлюзу"
 msgid "Use routing table"
 msgstr "Використовувати таблицю маршрутизації"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -6048,7 +6063,7 @@ msgstr "VDSL"
 msgid "VLANs on %q"
 msgstr "VLAN на %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr "VPN"
 
@@ -6128,10 +6143,6 @@ msgstr ""
 "WPA-шифрування потребує інсталяції <em>wpa_supplicant</em> (для режиму "
 "клієнта) або <em>hostapd</em> (для Точки доступу та режиму ad-hoc)."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "Очікуємо завершення виконання команди..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "Очікуємо пристрій..."
@@ -6170,9 +6181,9 @@ msgstr "Ширина"
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Бездротові мережі"
 
@@ -6220,7 +6231,7 @@ msgstr "Бездротову мережу вимкнено"
 msgid "Wireless network is enabled"
 msgstr "Бездротову мережу ввімкнено"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Записувати отримані DNS-запити до системного журналу"
 
@@ -6252,9 +6263,9 @@ msgstr ""
 "Якщо ви вимкнете основний скрипт ініціалізації (наприклад \"network\"), "
 "пристрій може стати недоступним!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6278,7 +6289,7 @@ msgstr "Налаштування ZRam"
 msgid "ZRam Size"
 msgstr "Розмір ZRam"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "будь-який"
 
@@ -6367,13 +6378,14 @@ msgstr "вимкнено"
 msgid "driver default"
 msgstr "типово для драйвера"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "минув"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6427,7 +6439,7 @@ msgstr "ключ від 8 до 63 символів"
 msgid "key with either 5 or 13 characters"
 msgstr "ключ із 5 або 13 символів"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 "Локальний <abbr title=\"Domain Name System — система доменних імен\">DNS</"
@@ -6466,16 +6478,16 @@ msgstr "не присутній"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "вимкнено"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "увімкнено"
@@ -6553,8 +6565,9 @@ msgstr "унікальне значення"
 msgid "unknown"
 msgstr "невідомий"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6582,6 +6595,7 @@ msgid "untagged"
 msgstr "не позначено"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr "дійсна IP-адреса"
 
@@ -6594,6 +6608,7 @@ msgid "valid IPv4 CIDR"
 msgstr "дійсна IPv4 CIDR"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr "дійсна IPv4-адреса"
 
@@ -6622,6 +6637,7 @@ msgid "valid IPv6 CIDR"
 msgstr "дійсна IPv6 CIDR"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr "дійсна IPv6-адреса"
 
@@ -6681,6 +6697,9 @@ msgstr "дійсне ім'я хоста:порт"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr "дійсне ім'я хоста"
 
@@ -6706,6 +6725,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr "дійсний порт або діапазон портів (порт1-порт2)"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr "дійсне значення порту"
 
@@ -6753,6 +6773,18 @@ msgstr "так"
 msgid "« Back"
 msgstr "« Назад"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Вказано неправильну адресу!"
+
+#~ msgid "Install iputils-traceroute6 for IPv6 traceroute"
+#~ msgstr "Інсталюйте iputils-traceroute6 для трасування IPv6"
+
+#~ msgid "Loading"
+#~ msgstr "Завантаження"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "Очікуємо завершення виконання команди..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Призначення інтерфейсів..."
 
diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index 93185e081..1539dbe4b 100644
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -43,6 +43,8 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -149,15 +151,15 @@ msgstr "thời gian thử lại chuẩn 802.11w"
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Dịch vụ căn bản đặt Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Hệ thống phân giải tên miền\">DNS</abbr> query port"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "abbr title=\"Hệ thống phân giải tiên miền\">DNS</abbr> server port"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -169,7 +171,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Mở rộng dịch vụ đặt Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"giao thức internet phiên bản 4\">IPv4</abbr>-Address"
@@ -196,13 +198,14 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"giao thức internet phiên bản 6\">IPv6</abbr>-Gateway"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 "<abbr title=\"giao thức internet phiên bản 6\">IPv6</abbr>-Suffix (hex)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"đèn LEDLED\">LED</abbr> Configuration"
 
@@ -210,17 +213,17 @@ msgstr "<abbr title=\"đèn LEDLED\">LED</abbr> Configuration"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 "<abbr title=\"Kiểm soát kết nối phương tiện truyền thông\">MAC</abbr>-Address"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr "<abbr title=\"Định danh độc nhất cho DHCP\">DUID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -228,7 +231,7 @@ msgstr ""
 "<abbr title=\"Tối đa\">Max.</abbr> <abbr title=\"Giao thức cấu hình máy chủ "
 "động\">DHCP</abbr> leases"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -236,7 +239,7 @@ msgstr ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Cơ chế mở rộng hệ thống  "
 "phân giải tên miền\">EDNS0</abbr> packet size"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"Tối đa\">Max.</abbr> concurrent queries"
 
@@ -361,6 +364,7 @@ msgstr "kết nối đang hoạt động"
 msgid "Active DHCP Leases"
 msgstr "Khởi động xin id từ DHCP"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "Khởi động xin id từ DHCPv6"
@@ -416,7 +420,7 @@ msgstr "Thêm ví dụ"
 msgid "Add key"
 msgstr "Thêm khóa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Thêm hậu tố tên miền cục bộ vào tên được phân phát từ tệp máy chủ"
 
@@ -429,11 +433,11 @@ msgstr "Thêm giao diện mới..."
 msgid "Add peer"
 msgstr "Thêm cặp"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "Tập tin máy chủ(host) bổ sung"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "Tập tin máy chủ(server) bổ sung"
 
@@ -454,12 +458,13 @@ msgstr "Địa chỉ"
 msgid "Address to access local relay bridge"
 msgstr "Địa chỉ truy cập cầu chuyển tiếp địa phương"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Quản trị"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -488,17 +493,17 @@ msgstr "Giao diện bí danh"
 msgid "Alias of \"%s\""
 msgstr "bí danh của \"%s\""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr "Tất cả máy chủ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr "Phân bổ địa chỉ IP theo tuần tự, bắt đầu từ địa chỉ có sẵn thấp nhất"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr "Phân bổ tuần tự địa chủ IP"
 
@@ -522,7 +527,7 @@ msgstr "Cho phép kế thừ tốc độ 802.11b"
 msgid "Allow listed only"
 msgstr "Chỉ cho phép danh sách liệt kê"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "Cho phép máy chủ cục bộ"
 
@@ -538,7 +543,7 @@ msgstr "Cho phép root đăng nhập với mật khẩu"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Cho phép người dùng <em>root</em> đăng nhập với mật khẩu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr "Cho phép phản hồi ngược trong dải IP 127.0.0.0/8 cho dịch vụ RBL"
@@ -718,7 +723,7 @@ msgstr "Xác thực"
 msgid "Authentication Type"
 msgstr "Kiểu xác thực"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "Xác thực"
 
@@ -726,11 +731,11 @@ msgstr "Xác thực"
 msgid "Authorization Required"
 msgstr "Yêu cầu ủy quyền"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -824,6 +829,7 @@ msgid "Backup"
 msgstr "Sao lưu"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Sao lưu / cập nhật phần mềm"
 
@@ -832,10 +838,6 @@ msgstr "Sao lưu / cập nhật phần mềm"
 msgid "Backup file list"
 msgstr "Danh sách tập tin sau lưu"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "Địa chỉ không đạt yêu cầu"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -856,7 +858,7 @@ msgstr ""
 "đổi tập tin cấu hình được đánh dấu bởi opkg, tập tin cơ sở thiết yếu và các "
 "mẫu sao lưu của người dùng đá được xác định"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -878,7 +880,7 @@ msgstr "Liên kết đường hầm dữ liệu với giao diện này (tùy ch�
 msgid "Bitrate"
 msgstr "tốc độ (bit)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "Ghi đè tên miền Bogus NX"
 
@@ -1070,10 +1072,11 @@ msgid "Close list..."
 msgstr "Danh sách đã đóng ..."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "Đang lấy dữ liệu..."
 
@@ -1106,7 +1109,6 @@ msgstr ""
 "giảm độ mạnh của khóa, đặc biệt là trong các môi trường có lưu lượng tải lớn."
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "Cấu hình"
@@ -1146,7 +1148,7 @@ msgstr "Kết nối thất bại"
 msgid "Connection lost"
 msgstr "Mất kết nối"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "Kết nối"
 
@@ -1246,8 +1248,8 @@ msgstr "DAE-bí mật"
 msgid "DHCP Server"
 msgstr "Máy chủ DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP và DNS"
 
@@ -1282,7 +1284,7 @@ msgstr "Dịch vụ DHCPv6"
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr ""
 
@@ -1290,11 +1292,11 @@ msgstr ""
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr "kiểm tra không dấu DNSSEC"
 
@@ -1323,6 +1325,7 @@ msgstr "Chế độ DSL Line"
 msgid "DTIM Interval"
 msgstr "Chu kỳ DTIM"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr ""
@@ -1461,8 +1464,7 @@ msgstr "Thiết bị không thể truy cập! "
 msgid "Device unreachable! Still waiting for device..."
 msgstr "Thiết bị không thể truy cập! Chờ thiết bị..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "Phân tích"
 
@@ -1521,7 +1523,7 @@ msgstr "Vô hiệu hóa"
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Hủy liên kết với xác nhận mức thấp"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "Hủy phản hồi ngược RFC1918"
 
@@ -1555,7 +1557,7 @@ msgstr "Khoảng cách tối ưu"
 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"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1567,16 +1569,16 @@ msgstr ""
 "Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
 "firewalls"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 "Không lưu trữ các phản hồi tiêu cực (ví dụ: các tên miền không tồn tại)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr "Không chuyển tiếp yêu cầu mà máy chủ tên công cộng không thể trả lời"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Không chuyển tiếp tra cứu ngược cho các mạng cục bộ"
 
@@ -1596,11 +1598,11 @@ msgstr "Bạn có thật sự muốn xóa tất cả cài đặt này?"
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr "Bạn thật sự muốn xóa toàn bộ thư mục \"%s\" ?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "Tên miền yêu cầu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "Danh sách tên miền được chấp nhận"
 
@@ -1608,7 +1610,7 @@ msgstr "Danh sách tên miền được chấp nhận"
 msgid "Don't Fragment"
 msgstr "Không phân mảnh"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1760,7 +1762,7 @@ msgstr "Kích hoạt máy chủ NTP"
 msgid "Enable Single DES"
 msgstr "Kích hoạt DES đơn"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "Kích hoạt máy chủ TFTP"
 
@@ -1881,11 +1883,11 @@ msgstr "Bộ tương hợp ethernet"
 msgid "Ethernet Switch"
 msgstr "Bộ chuyển đảo ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "Mở rộng máy chủ"
 
@@ -1894,6 +1896,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr "Cần một gợi ý gán thập lục phân"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr "Mong đợi: %s"
 
@@ -1970,7 +1979,7 @@ msgstr "Tệp tin không thể truy cập"
 msgid "Filename"
 msgstr "Tên tệp"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "Tên tệp của tập tin ảnh khởi động được thông báo cho máy khách"
 
@@ -1979,11 +1988,11 @@ msgstr "Tên tệp của tập tin ảnh khởi động được thông báo cho
 msgid "Filesystem"
 msgstr "Tập tin hệ thống"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "Filter private"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "Lọc không hữu dụng"
 
@@ -2008,7 +2017,7 @@ msgstr "Tìm và hòa mạng"
 msgid "Finish"
 msgstr "Kết thúc"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "Tường lửa"
 
@@ -2032,7 +2041,7 @@ msgstr "Tập tin phần mềm"
 msgid "Firmware Version"
 msgstr "Phiên bản phần mềm"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Đã sửa cổng nguồn cho các truy vấn DNS"
 
@@ -2163,7 +2172,7 @@ msgstr "Địa chỉ Gateway không hợp lệ"
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2202,9 +2211,9 @@ msgstr "Cài đặt toàn cục"
 msgid "Global network options"
 msgstr "Tùy chọn mạng toàn cầu"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "Tới trang cài đặt mật khẩu..."
@@ -2257,6 +2266,7 @@ msgstr "Giấu <abbr title=\"Chế độ mở rộng đặt Identifier\">ESSID</
 msgid "Hide empty chains"
 msgstr "Giấu chuỗi rỗng"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2280,7 +2290,7 @@ msgid "Host-Uniq tag content"
 msgstr "Nội dung thẻ Host-Uniq"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2293,7 +2303,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "Tên máy chủ khi yêu cầu DHCP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "Tên máy chủ"
 
@@ -2331,13 +2341,13 @@ msgstr "Địa chỉ IP không hợp lệ"
 msgid "IP address is missing"
 msgstr "Mất địa chỉ IP"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
@@ -2405,6 +2415,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2415,8 +2427,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2486,6 +2496,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2586,7 +2597,7 @@ msgstr ""
 "một quá trình rất chậm vì một thiết bị swap không thể được truy cập với  "
 "datarates cao hơn của <abbr title=\"Random Access Memory\">RAM</abbr>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Lờ đi <code>/etc/hosts</code>"
 
@@ -2594,7 +2605,7 @@ msgstr "Lờ đi <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "Lờ đi giao diện"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "Lờ đi tập tin resolve"
 
@@ -2648,10 +2659,6 @@ msgstr "Kịch bản khởi tạo"
 msgid "Initscripts"
 msgstr "Nhiều kịch bản khởi tạo"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr "Cài đặt iputils-traceroute6 cho IPv6 traceroute"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "Đang cài đặt bản mở rộng cho giao thức..."
@@ -2713,7 +2720,7 @@ msgstr "Giao diện mạng chưa có hoặc chưa được kết nối"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "Giao diện"
 
@@ -2773,9 +2780,9 @@ 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!"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "Yêu cầu JavaScript"
@@ -2796,8 +2803,8 @@ msgstr "Hòa mạng: %q"
 msgid "Keep settings and retain the current configuration"
 msgstr "Giữ cài đặt và cấu hình hiện tại"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "Nhật ký lõi"
 
@@ -2873,16 +2880,17 @@ msgstr "Độ trễ"
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "Thời gian được cấp một địa chỉ IP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Leasefile"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2909,13 +2917,13 @@ msgstr ""
 msgid "Limit"
 msgstr "Giới hạn "
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 "Giới hạn dịch vụ DNS đối với các giao diện mạng con mà chúng tôi đang phục "
 "vụ DNS."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2939,7 +2947,7 @@ msgstr ""
 msgid "Link On"
 msgstr "Link On"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2977,15 +2985,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr "Danh sách tập tin khóa SSH để xác thực"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Danh sách tên miền chấp nhận phản hồi RFC1918"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "Danh sách các máy chủ cung cấp kết quả tên miền NX không có thật"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr "Lắng nghe giao diện mạng"
 
@@ -2997,12 +3005,12 @@ msgstr "Lắng nghe cổng"
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr "Chỉ nghe giao diện mạng đã cho (nếu không xác định sẽ nghe tất cả)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "Cổng để nghe cho các truy vấn DNS gửi đến"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "Tải "
 
@@ -3010,10 +3018,6 @@ msgstr "Tải "
 msgid "Load Average"
 msgstr "Tải trung bình"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "Đang tải"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr "Đang tải nội dung thư mục..."
@@ -3046,7 +3050,7 @@ msgstr "Địa chỉ IPv4 cục bộ"
 msgid "Local IPv6 address"
 msgstr "Địa chỉ IPv6 cục bộ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr "Chỉ dùng dịch vụ cục bộ"
 
@@ -3059,11 +3063,11 @@ msgstr "Khởi động cục bộ với hệ thống"
 msgid "Local Time"
 msgstr "Giờ địa phương"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "Tên miền cục bộ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3071,22 +3075,22 @@ msgstr ""
 "Đặc tả miền cục bộ. Tên phù hợp với miền này không bao giờ được chuyển tiếp "
 "và chỉ được giải quyết từ DHCP hoặc tập tin từ máy chủ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr "Hậu tố tên miền cục bộ gắn vào tên DHCP và các mục tập tin từ máy chủ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "máy chủ cục bộ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr ""
 "Cục bộ hóa tên máy chủ tùy thuộc vào mạng con yêu cầu nếu có sẵn nhiều IP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "Tra vấn địa phương"
 
@@ -3094,7 +3098,7 @@ msgstr "Tra vấn địa phương"
 msgid "Log output level"
 msgstr "Cấp độ lưu nhật ký cho đầu ra"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "Bản ghi tra vấn"
 
@@ -3106,7 +3110,7 @@ msgstr "Lưu nhật ký"
 msgid "Login"
 msgstr "Đăng nhập "
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "Thoát ra"
 
@@ -3205,15 +3209,15 @@ msgstr "Tối đa tốc độ dữ liệu đạt được (ATTNDR)"
 msgid "Maximum allowed Listen Interval"
 msgstr "Chu kỳ nghe tối đa cho phép"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Số lượng tối đa máy mượn địa chỉ từ DHCP đang hoạt động"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Số lượng truy vấn DNS đồng thời tối đa được phép"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Kích thước tối đa được phép của gói UDP EDNS.0"
 
@@ -3353,6 +3357,7 @@ msgstr "Lắp điểm"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Lắp điểm"
 
@@ -3446,11 +3451,10 @@ msgstr "Tên"
 msgid "Name of the new network"
 msgstr ""
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "Điều hướng"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3458,14 +3462,15 @@ msgstr "Điều hướng"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "Mạng "
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "Tiện ích mạng"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "Tập tin ảnh khởi động mạng"
 
@@ -3523,13 +3528,13 @@ msgstr "Không có thông tin"
 msgid "No matching prefix delegation"
 msgstr "Không có tiền tố ủy quyền phù hợp"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "Không có bộ đệm âm"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "Chưa được cài đặt mật khẩu!"
@@ -3575,7 +3580,7 @@ msgstr "Nhiễu:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "Lỗi CRC không tiền phát sinh (CRC_P)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3617,11 +3622,11 @@ msgstr "Không được hỗ trợ"
 msgid "Notice"
 msgstr "Chú ý"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 "Số lượng mục DNS được lưu trong bộ nhớ cache (tối đa là 10000, 0 là không "
@@ -3670,7 +3675,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "Một trong những tên máy chủ hoặc địa chỉ mac phải được chỉ định"
 
@@ -3860,7 +3865,7 @@ msgstr ""
 msgid "Override the table used for internal routes"
 msgstr "Ghi đè bảng được sử dụng cho định tuyến nội bộ"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "Tổng quan"
 
@@ -4088,8 +4093,9 @@ msgstr "Tốc độ Phy"
 msgid "Physical Settings"
 msgstr "Cài đặt căn bản"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr ""
 
@@ -4167,7 +4173,7 @@ msgstr ""
 "Coi như thiết bị mạng ngang hàng mất kết nối sau số lần kiểm tra lỗi bằng "
 "phương pháp LCP, sử dụng 0 để bỏ qua"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr "Ngăn thực hiện nghe tại giao diện mạng này"
 
@@ -4180,7 +4186,7 @@ msgid "Private Key"
 msgstr "Khóa riêng tư"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "Tiến trình"
 
@@ -4242,7 +4248,7 @@ msgstr ""
 msgid "Quality"
 msgstr "Chất lượng"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4313,7 +4319,7 @@ msgstr ""
 "Dữ liệu thô được mã hóa thập lục phân (byte). Để trống trừ khi ISP của bạn "
 "yêu cầu điều này"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4325,7 +4331,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "Bạn thật sự muốn đổi giao thức?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "Biểu đồ thời gian thực"
 
@@ -4333,12 +4339,13 @@ msgstr "Biểu đồ thời gian thực"
 msgid "Reassociation Deadline"
 msgstr "Hạn chót tái tổ chức"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "Bảo vệ tái kết nối"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Khởi động lại"
 
@@ -4473,7 +4480,7 @@ msgstr ""
 "Yêu cầu phiên bản 'đầy đủ' của wpad/hostapd và hỗ trợ từ phần mềm điều khiển "
 "wifi <br />(kể từ tháng 1 năm 2019: ath9k, ath10k, mwlwifi và mt76) "
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4521,11 +4528,11 @@ msgstr "Khởi động lại bộ đếm"
 msgid "Reset to defaults"
 msgstr "Phục hồi về mặc định"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "Tập tin Resolv và Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "Tập tin Resolv"
 
@@ -4577,7 +4584,7 @@ msgstr "Yêu cầu hoàn nguyên không thành công với trạng thái <code>%
 msgid "Reverting configuration…"
 msgstr "Đang hoàn nguyên cấu hình .."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "Thư mục gốc cho các tệp được lấy qua TFTP"
 
@@ -4603,12 +4610,13 @@ msgstr "Dịch vụ quảng bá bộ định tuyến"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Mật khẩu bộ định tuyến"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "Định tuyến"
 
@@ -4646,6 +4654,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Kết nối SSH"
 
@@ -4663,6 +4672,7 @@ msgstr "Tên người dùng SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4707,6 +4717,7 @@ msgstr "quét"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Nhiệm vụ theo lịch trình"
 
@@ -4749,7 +4760,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "Cấu hình máy chủ"
 
@@ -4762,7 +4773,7 @@ msgstr "Tên dịch vụ"
 msgid "Service Type"
 msgstr "Kiểu dịch vụ"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "Dịch vụ "
 
@@ -4856,7 +4867,7 @@ msgstr "Tín hiệu:"
 msgid "Size"
 msgstr "Dung lượng "
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr "Dung lượng của bộ nhớ tạm truy vấn DNS"
 
@@ -4869,11 +4880,11 @@ msgstr "Dung lượng thiết bị ZRam(MB)"
 msgid "Skip"
 msgstr "Chuyển"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "Nhảy tới nội dung"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "Chuyển đến mục định hướng"
 
@@ -4984,6 +4995,7 @@ msgstr "Bắt đầu quét mạng ..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Khởi động"
 
@@ -4995,11 +5007,11 @@ msgstr "Định tuyến tĩnh IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Định tuyến tĩnh IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "Thống kê địa chỉ đã cấp phát"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "Định tuyến tĩnh"
 
@@ -5009,7 +5021,7 @@ msgstr "Định tuyến tĩnh"
 msgid "Static address"
 msgstr "Địa chỉ tĩnh"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -5024,10 +5036,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr "Giới hạn không hoạt động của máy trạm"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "Trạng thái"
 
@@ -5037,7 +5049,7 @@ msgstr "Trạng thái"
 msgid "Stop"
 msgstr "Dừng"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "Yêu cầu nghiêm ngặt"
 
@@ -5050,11 +5062,11 @@ msgstr "Mạnh"
 msgid "Submit"
 msgstr "Trình "
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr "Dừng lưu nhật ký"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Bỏ lưu nhật ký hoạt động định tuyến của các giao thức này"
 
@@ -5063,7 +5075,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "Chuyển đổi"
 
@@ -5113,15 +5125,16 @@ msgstr "Đồng bộ với máy chủ NTP"
 msgid "Sync with browser"
 msgstr "Đồng bộ với trình duyệt web"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Hệ thống"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "Nhật ký hệ thống"
 
@@ -5137,11 +5150,11 @@ msgstr "Kích cỡ bộ đệm nhật ký hệ thống"
 msgid "TCP:"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "Cài đặt TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "Máy chủ gốc TFTP"
 
@@ -5390,7 +5403,8 @@ 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."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5400,9 +5414,9 @@ msgstr "Không có máy được cấp IP nào hoạt động"
 msgid "There are no changes to apply"
 msgstr "Không có thay đổi nào để áp dụng"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5423,7 +5437,7 @@ msgstr "Loại xác thực này không áp dụng cho phương pháp EAP đã ch
 msgid "This does not look like a valid PEM file"
 msgstr "Tập tin không giống như một tệp PEM hợp lệ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5468,7 +5482,7 @@ msgstr ""
 "Đây là địa chỉ điểm cuối cục bộ được chỉ định bởi tunnel broker, nó thường "
 "kết thúc bằng <code>...:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5544,14 +5558,15 @@ msgstr ""
 msgid "Total Available"
 msgstr "Tất cả có sẵn"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Theo dấu định tuyến"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr ""
 
@@ -5783,7 +5798,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "Uptime"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Dùng <code>/etc/ethers</code>"
 
@@ -5894,7 +5909,7 @@ msgstr "Sử dụng gateway metric"
 msgid "Use routing table"
 msgstr "Sử dụng bảng định tuyến"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5950,7 +5965,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -6030,10 +6045,6 @@ msgstr ""
 "Mã hóa WPA yêu cầu phải cài đặt wpa_supplicant (đối với chế độ máy khách) "
 "hoặc hostapd (đối với chế độ AP và ad-hoc)."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "Vui lòng chờ đến khi lệnh được thực thi hoàn thành..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "Đợi thiết bị..."
@@ -6071,9 +6082,9 @@ msgstr "Độ dài"
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "Không dây"
 
@@ -6121,7 +6132,7 @@ msgstr "Mạng không dây bị vô hiệu hóa"
 msgid "Wireless network is enabled"
 msgstr "Mạng không dây được kích hoạt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "Viết yêu cầu DNS nhận được vào nhật ký hệ thống"
 
@@ -6153,9 +6164,9 @@ msgstr ""
 "bạn vô hiệu hoá kịch bản khởi động thiết yếu như &amp;quot;network&amp;"
 "quot;, công cụ của bạn chó thể trở nên không truy cập được</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6179,7 +6190,7 @@ msgstr "Thiết đặt ZRam"
 msgid "ZRam Size"
 msgstr "Kích cỡ ZRam"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "Bất kể"
 
@@ -6269,13 +6280,14 @@ msgstr "Vô hiệu hóa"
 msgid "driver default"
 msgstr "Bộ điều khiển mặc didinhj"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "Hết hạn"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6329,7 +6341,7 @@ msgstr "Mật khẩu từ 8 đến 63 ký tự"
 msgid "key with either 5 or 13 characters"
 msgstr "Mật khẩu có 5 hoặc 13 ký tự"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Tập tin <abbr title=\"Hệ thống tên miền\">DNS</abbr> địa phương"
 
@@ -6366,16 +6378,16 @@ msgstr "Không có sẵn"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "Tắt"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "Bật"
@@ -6453,8 +6465,9 @@ msgstr "Giá trị độc nhất"
 msgid "unknown"
 msgstr "Không xác định"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6482,6 +6495,7 @@ msgid "untagged"
 msgstr "Chưa được gắn thẻ"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr "Địa chỉ IP hợp lệ"
 
@@ -6494,6 +6508,7 @@ msgid "valid IPv4 CIDR"
 msgstr "IPv4 CIDR hợp lệ"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr "Địa chỉ IPv4 hợp lệ"
 
@@ -6522,6 +6537,7 @@ msgid "valid IPv6 CIDR"
 msgstr "IPv6 CIDR hợp lệ"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr "Địa chỉ IPv6 hợp lệ"
 
@@ -6581,6 +6597,9 @@ msgstr "Máy-chủ:cổng hợp lệ"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr "Tên máy chủ hợp lệ"
 
@@ -6606,6 +6625,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr "Cổng hoặc tầm cổng hợp lệ (Cổng 1- Cổng 2)"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr "Giá trị cổng hợp lệ"
 
@@ -6653,6 +6673,18 @@ msgstr "Có"
 msgid "« Back"
 msgstr "« Quay lại"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "Địa chỉ không đạt yêu cầu"
+
+#~ msgid "Install iputils-traceroute6 for IPv6 traceroute"
+#~ msgstr "Cài đặt iputils-traceroute6 cho IPv6 traceroute"
+
+#~ msgid "Loading"
+#~ msgstr "Đang tải"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "Vui lòng chờ đến khi lệnh được thực thi hoàn thành..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "Chỉ định giao diện"
 
diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index 7f1fcc2b1..9a4668f35 100644
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -43,6 +43,8 @@ msgstr "（最近 %d 分钟信息，每 %d 秒刷新）"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -149,15 +151,15 @@ msgstr "802.11w 重试超时"
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> 查询端口"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> 服务器端口"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -169,7 +171,7 @@ msgstr ""
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr> 地址"
@@ -195,13 +197,14 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr> 网关"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr> 后缀（十六进制）"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 配置"
 
@@ -209,16 +212,16 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 配置"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 名称"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr> 地址"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -226,7 +229,7 @@ msgstr ""
 "<abbr title=\"maximal\">最大</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> 租约数量"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -234,7 +237,7 @@ msgstr ""
 "<abbr title=\"maximal\">最大</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> 数据包大小"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">最大</abbr>并发查询数"
 
@@ -353,6 +356,7 @@ msgstr "活动连接"
 msgid "Active DHCP Leases"
 msgstr "已分配的 DHCP 租约"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "已分配的 DHCPv6 租约"
@@ -408,7 +412,7 @@ msgstr "添加实例"
 msgid "Add key"
 msgstr "添加密钥"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "添加本地域名后缀到 HOSTS 文件中的域名"
 
@@ -421,11 +425,11 @@ msgstr "添加新接口…"
 msgid "Add peer"
 msgstr "添加对等点"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "额外的 HOSTS 文件"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "额外的 SERVERS 文件"
 
@@ -446,12 +450,13 @@ msgstr "地址"
 msgid "Address to access local relay bridge"
 msgstr "接入本地中继桥的地址"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "管理权"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -480,17 +485,17 @@ msgstr "接口别名"
 msgid "Alias of \"%s\""
 msgstr "\"%s\" 的别名"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr "所有服务器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr "从最低可用地址开始顺序分配 IP 地址"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr "顺序分配 IP"
 
@@ -514,7 +519,7 @@ msgstr "允许传统的 802.11b 速率"
 msgid "Allow listed only"
 msgstr "仅允许列表内"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "允许本机"
 
@@ -530,7 +535,7 @@ msgstr "允许 root 用户凭密码登录"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "允许 <em>root</em> 用户凭密码登录"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr "允许 127.0.0.0/8 回环范围内的上行响应，例如：RBL 服务"
@@ -702,7 +707,7 @@ msgstr "认证"
 msgid "Authentication Type"
 msgstr "认证类型"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "唯一授权"
 
@@ -710,11 +715,11 @@ msgstr "唯一授权"
 msgid "Authorization Required"
 msgstr "需要授权"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -808,6 +813,7 @@ msgid "Backup"
 msgstr "备份"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "备份/升级"
 
@@ -816,10 +822,6 @@ msgstr "备份/升级"
 msgid "Backup file list"
 msgstr "文件备份列表"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "指定了错误的地址！"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -839,7 +841,7 @@ msgstr ""
 "下面是待备份的文件清单。包含了更改的配置文件、必要的基础文件和用户自定义的需"
 "备份文件。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -859,7 +861,7 @@ msgstr "将隧道绑定到此接口（可选）。"
 msgid "Bitrate"
 msgstr "传输速率"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "忽略虚假空域名解析"
 
@@ -1049,10 +1051,11 @@ msgid "Close list..."
 msgstr "关闭列表…"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "正在收集数据…"
 
@@ -1084,7 +1087,6 @@ msgstr ""
 "负载较重的环境中。"
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "配置"
@@ -1124,7 +1126,7 @@ msgstr "尝试连接失败"
 msgid "Connection lost"
 msgstr "失去连接"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "连接"
 
@@ -1220,8 +1222,8 @@ msgstr "DAE 加密"
 msgid "DHCP Server"
 msgstr "DHCP 服务器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP/DNS"
 
@@ -1256,7 +1258,7 @@ msgstr "DHCPv6 服务"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "DNS 转发"
 
@@ -1264,11 +1266,11 @@ msgstr "DNS 转发"
 msgid "DNS-Label / FQDN"
 msgstr "DNS-Label / FQDN"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr "DNSSEC 检查未签名"
 
@@ -1297,6 +1299,7 @@ msgstr "DSL 线路模式"
 msgid "DTIM Interval"
 msgstr "DTIM 间隔"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DUID"
@@ -1437,8 +1440,7 @@ msgstr "无法连接到设备！"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "无法连接到设备！仍旧等待设备…"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "网络诊断"
 
@@ -1497,7 +1499,7 @@ msgstr "已禁用"
 msgid "Disassociate On Low Acknowledgement"
 msgstr "在低 Ack 应答时断开连接"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "丢弃 RFC1918 上行响应数据"
 
@@ -1531,7 +1533,7 @@ msgstr "距离优化"
 msgid "Distance to farthest network member in meters."
 msgstr "最远网络用户的距离（米）。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1542,15 +1544,15 @@ msgstr ""
 "了一个集成的 <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "服务器和 <abbr title=\"Domain Name System\">DNS</abbr> 转发器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr "不缓存无用的回应, 比如：不存在的域名"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr "不转发公共域名服务器无法回应的请求"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "不转发本地网络的反向查询"
 
@@ -1570,11 +1572,11 @@ msgstr "您真的要清除所有设置吗？"
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr "您真的要删除目录“%s”吗？"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "忽略空域名解析"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "域名白名单"
 
@@ -1582,7 +1584,7 @@ msgstr "域名白名单"
 msgid "Don't Fragment"
 msgstr "禁止分片"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1728,7 +1730,7 @@ msgstr "启用 NTP 客户端"
 msgid "Enable Single DES"
 msgstr "启用单个 DES"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "启用 TFTP 服务器"
 
@@ -1848,11 +1850,11 @@ msgstr "以太网适配器"
 msgid "Ethernet Switch"
 msgstr "以太网交换机"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr "排除接口"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "扩展 HOSTS 文件中的主机后缀"
 
@@ -1861,6 +1863,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr "这里需要一个十六进制值"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr "需要：%s"
 
@@ -1937,7 +1946,7 @@ msgstr "文件无法访问"
 msgid "Filename"
 msgstr "文件名"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "向客户端通告的启动镜像文件名"
 
@@ -1946,11 +1955,11 @@ msgstr "向客户端通告的启动镜像文件名"
 msgid "Filesystem"
 msgstr "文件系统"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "过滤本地包"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "过滤无用包"
 
@@ -1973,7 +1982,7 @@ msgstr "搜索并加入网络"
 msgid "Finish"
 msgstr "完成"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "防火墙"
 
@@ -1997,7 +2006,7 @@ msgstr "固件文件"
 msgid "Firmware Version"
 msgstr "固件版本"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "指定的 DNS 查询源端口"
 
@@ -2127,7 +2136,7 @@ msgstr "网关地址无效"
 msgid "Gateway metric"
 msgstr "网关跃点"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2166,9 +2175,9 @@ msgstr "全局设置"
 msgid "Global network options"
 msgstr "全局网络选项"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "跳转到密码配置页…"
@@ -2219,6 +2228,7 @@ msgstr "隐藏 <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgid "Hide empty chains"
 msgstr "隐藏空链"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2242,7 +2252,7 @@ msgid "Host-Uniq tag content"
 msgstr "Host-Uniq 标签内容"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2255,7 +2265,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "请求 DHCP 时发送的主机名"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "主机映射"
 
@@ -2293,13 +2303,13 @@ msgstr "IP 地址无效"
 msgid "IP address is missing"
 msgstr "IP 地址缺失"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
@@ -2367,6 +2377,8 @@ msgstr "IPv4-in-IPv4 (RFC2003)"
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr "IPv4/IPv6 (双栈 - 默认 IPv4)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2377,8 +2389,6 @@ msgstr "IPv4/IPv6 (双栈 - 默认 IPv4)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
@@ -2448,6 +2458,7 @@ msgstr "IPv6 路由前缀"
 msgid "IPv6 suffix"
 msgstr "IPv6 后缀"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2543,7 +2554,7 @@ msgstr ""
 "swap 设备无法像 <abbr title=\"Random Access Memory\">RAM</abbr> 这样的高速率"
 "访问。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "忽略 <code>/etc/hosts</code>"
 
@@ -2551,7 +2562,7 @@ msgstr "忽略 <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "忽略此接口"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "忽略解析文件"
 
@@ -2605,10 +2616,6 @@ msgstr "启动脚本"
 msgid "Initscripts"
 msgstr "启动脚本"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr "安装 iputils-traceroute6 以进行 IPv6 路由追踪"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "安装扩展协议…"
@@ -2670,7 +2677,7 @@ msgstr "接口不存在或未连接。"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "接口"
 
@@ -2725,9 +2732,9 @@ msgid ""
 "flash memory, please verify the image file!"
 msgstr "您尝试刷写的固件与本路由器不兼容，请重新验证固件文件！"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "需要 JavaScript！"
@@ -2748,8 +2755,8 @@ msgstr "加入网络：%q"
 msgid "Keep settings and retain the current configuration"
 msgstr "保留当前配置"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "内核日志"
 
@@ -2825,16 +2832,17 @@ msgstr "延迟"
 msgid "Leaf"
 msgstr "叶节点"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "租期"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "租约文件"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2861,11 +2869,11 @@ msgstr "图例："
 msgid "Limit"
 msgstr "客户数"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr "仅在网卡所属的子网中提供 DNS 服务。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "仅监听这些接口和环回接口。"
 
@@ -2889,7 +2897,7 @@ msgstr "线路运行时间"
 msgid "Link On"
 msgstr "活动链接"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2925,15 +2933,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr "用于认证的 SSH 密钥文件列表"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "允许 RFC1918 响应的域名列表"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "允许虚假空域名响应的服务器列表"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr "监听接口"
 
@@ -2945,12 +2953,12 @@ msgstr "监听端口"
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr "仅监听指定的接口，未指定则监听全部"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "入站 DNS 查询端口"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "载入"
 
@@ -2958,10 +2966,6 @@ msgstr "载入"
 msgid "Load Average"
 msgstr "平均负载"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "加载中"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr "正在载入目录内容…"
@@ -2994,7 +2998,7 @@ msgstr "本地 IPv4 地址"
 msgid "Local IPv6 address"
 msgstr "本地 IPv6 地址"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr "仅本地服务"
 
@@ -3007,31 +3011,31 @@ msgstr "本地启动脚本"
 msgid "Local Time"
 msgstr "本地时间"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "本地域名"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr "本地域名规则。与此域匹配的名称从不转发，仅从 DHCP 或 HOSTS 文件解析"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr "本地域名后缀将添加到 DHCP 和 HOSTS 文件条目"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "本地服务器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr "如果有多个 IP 可用，则根据请求来源的子网来本地化主机名"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "本地化查询"
 
@@ -3039,7 +3043,7 @@ msgstr "本地化查询"
 msgid "Log output level"
 msgstr "日志记录等级"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "记录查询日志"
 
@@ -3051,7 +3055,7 @@ msgstr "日志"
 msgid "Login"
 msgstr "登录"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "退出"
 
@@ -3148,15 +3152,15 @@ msgstr "最大可达数据速率（ATTNDR）"
 msgid "Maximum allowed Listen Interval"
 msgstr "允许的最大监听间隔"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "允许的最大 DHCP 租用数"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "允许的最大并发 DNS 查询数"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "允许的最大 EDNS.0 UDP 数据包大小"
 
@@ -3296,6 +3300,7 @@ msgstr "挂载点"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "挂载点"
 
@@ -3387,11 +3392,10 @@ msgstr "名称"
 msgid "Name of the new network"
 msgstr "新网络的名称"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "导航"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3399,14 +3403,15 @@ msgstr "导航"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "网络"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "网络工具"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "网络启动镜像"
 
@@ -3464,13 +3469,13 @@ msgstr "无可用信息"
 msgid "No matching prefix delegation"
 msgstr "无匹配的前缀委托"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "禁用无效信息缓存"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "未设置密码！"
@@ -3516,7 +3521,7 @@ msgstr "噪声："
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "非抢占 CRC 错误（CRC_P）"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr "非全部地址"
 
@@ -3558,11 +3563,11 @@ msgstr "不支持"
 msgid "Notice"
 msgstr "注意"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr "缓存的 DNS 条目数量（最大 10000，0 表示不缓存）"
 
@@ -3609,7 +3614,7 @@ msgstr "On-Link 路由"
 msgid "On-State Delay"
 msgstr "通电时间"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "请指定主机名或MAC地址！"
 
@@ -3790,7 +3795,7 @@ msgstr "重设发送到客户端的子网掩码。"
 msgid "Override the table used for internal routes"
 msgstr "重设内部路由表"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "概览"
 
@@ -4018,8 +4023,9 @@ msgstr "物理速率："
 msgid "Physical Settings"
 msgstr "物理设置"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ping"
 
@@ -4095,7 +4101,7 @@ msgid ""
 "ignore failures"
 msgstr "在指定数量的 LCP 响应故障后假定链路已断开，0 为忽略故障"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr "不监听这些接口。"
 
@@ -4108,7 +4114,7 @@ msgid "Private Key"
 msgstr "私钥"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "系统进程"
 
@@ -4167,7 +4173,7 @@ msgstr "QMI 蜂窝"
 msgid "Quality"
 msgstr "质量"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4235,7 +4241,7 @@ msgstr "Radius 认证服务器"
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr "原始 16 进制编码的字节。除非您的 ISP 要求，否则请留空"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4247,7 +4253,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "确定要切换协议？"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "实时信息"
 
@@ -4255,12 +4261,13 @@ msgstr "实时信息"
 msgid "Reassociation Deadline"
 msgstr "重关联截止时间"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "重绑定保护"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "重启"
 
@@ -4392,7 +4399,7 @@ msgstr ""
 "需要完整版本的 wpad/hostapd，并且 WiFi 驱动支持<br />（截止 2019.01，已知支持"
 "此特性的驱动有 ath9k、ath10k、mwlwifi 和 mt76）"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4438,11 +4445,11 @@ msgstr "复位计数器"
 msgid "Reset to defaults"
 msgstr "恢复到出厂设置"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "HOSTS 和解析文件"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "解析文件"
 
@@ -4494,7 +4501,7 @@ msgstr "恢复请求失败，状态 <code>%h</code>"
 msgid "Reverting configuration…"
 msgstr "正在恢复配置…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "TFTP 服务器的根目录"
 
@@ -4520,12 +4527,13 @@ msgstr "路由通告服务"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "主机密码"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "路由表"
 
@@ -4561,6 +4569,7 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH 访问"
 
@@ -4578,6 +4587,7 @@ msgstr "SSH 用户名"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH 密钥"
 
@@ -4622,6 +4632,7 @@ msgstr "扫描"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "计划任务"
 
@@ -4663,7 +4674,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr "定时发送 LCP 响应（秒），仅在结合了故障阈值时有效"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "服务器设置"
 
@@ -4676,7 +4687,7 @@ msgstr "服务名"
 msgid "Service Type"
 msgstr "服务类型"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "服务"
 
@@ -4769,7 +4780,7 @@ msgstr "信号："
 msgid "Size"
 msgstr "大小"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr "DNS 查询缓存的大小"
 
@@ -4782,11 +4793,11 @@ msgstr "ZRam 设备的大小（以兆字节为单位）"
 msgid "Skip"
 msgstr "跳过"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "跳到内容"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "跳转到导航"
 
@@ -4891,6 +4902,7 @@ msgstr "正在启动无线扫描…"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "启动项"
 
@@ -4902,11 +4914,11 @@ msgstr "静态 IPv4 路由"
 msgid "Static IPv6 Routes"
 msgstr "静态 IPv6 路由"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "静态地址分配"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "静态路由"
 
@@ -4916,7 +4928,7 @@ msgstr "静态路由"
 msgid "Static address"
 msgstr "静态地址"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4929,10 +4941,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr "非活动站点限制"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "状态"
 
@@ -4942,7 +4954,7 @@ msgstr "状态"
 msgid "Stop"
 msgstr "停止"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "严谨查序"
 
@@ -4955,11 +4967,11 @@ msgstr "强"
 msgid "Submit"
 msgstr "提交"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr "不记录日志"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "不记录这些协议的常规操作日志"
 
@@ -4968,7 +4980,7 @@ msgid "Swap free"
 msgstr "空闲交换区"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "交换机"
 
@@ -5016,15 +5028,16 @@ msgstr "与 NTP 服务器同步"
 msgid "Sync with browser"
 msgstr "同步浏览器时间"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "系统"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "系统日志"
 
@@ -5040,11 +5053,11 @@ msgstr "系统日志缓冲区大小"
 msgid "TCP:"
 msgstr "TCP："
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "TFTP 设置"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "TFTP 服务器根目录"
 
@@ -5281,7 +5294,8 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr "不支持所上传的映像文件格式，请选择适合当前平台的通用映像文件。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5291,9 +5305,9 @@ msgstr "没有已分配的租约"
 msgid "There are no changes to apply"
 msgstr "没有待应用的更改"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5312,7 +5326,7 @@ msgstr "此身份验证类型不适用于所选的 EAP 方法。"
 msgid "This does not look like a valid PEM file"
 msgstr "这不是有效的 PEM 文件"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5351,7 +5365,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr "隧道代理分配的本地终端地址，通常以 <code>...:2/64</code> 结尾"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5423,14 +5437,15 @@ msgstr "Tone"
 msgid "Total Available"
 msgstr "可用数"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "Traceroute"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "流量"
 
@@ -5660,7 +5675,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "运行时间"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "使用 <code>/etc/ethers</code> 配置"
 
@@ -5771,7 +5786,7 @@ msgstr "使用网关跃点"
 msgid "Use routing table"
 msgstr "使用路由表"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5826,7 +5841,7 @@ msgstr "VDSL"
 msgid "VLANs on %q"
 msgstr "%q 上的 VLAN"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr "VPN"
 
@@ -5906,10 +5921,6 @@ msgstr ""
 "WPA 加密需要安装 wpa_supplicant（客户端模式）或安装 hostapd（接入点 AP、点对"
 "点 Ad-Hoc 模式）。"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "等待命令执行完成…"
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "等待设备…"
@@ -5946,9 +5957,9 @@ msgstr "频宽"
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "无线"
 
@@ -5996,7 +6007,7 @@ msgstr "无线网络已禁用"
 msgid "Wireless network is enabled"
 msgstr "无线网络已启用"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "将收到的 DNS 请求写入系统日志"
 
@@ -6024,9 +6035,9 @@ msgstr ""
 "在此启用或禁用已安装的启动脚本，更改在设备重启后生效。<br /><strong>警告：如"
 "果禁用了必要的启动脚本，比如“network”，可能会导致无法访问设备！</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -6048,7 +6059,7 @@ msgstr "ZRam 设置"
 msgid "ZRam Size"
 msgstr "ZRam 大小"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "任意"
 
@@ -6137,13 +6148,14 @@ msgstr "已禁用"
 msgid "driver default"
 msgstr "驱动默认"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "过期时间"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6197,7 +6209,7 @@ msgstr "密钥在 8 到 63 个字符之间"
 msgid "key with either 5 or 13 characters"
 msgstr "密钥为 5 或 13 个字符"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "本地 <abbr title=\"Domain Name System\">DNS</abbr> 解析文件"
 
@@ -6234,16 +6246,16 @@ msgstr "不存在"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "关"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "开"
@@ -6321,8 +6333,9 @@ msgstr "唯一值"
 msgid "unknown"
 msgstr "未知"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6350,6 +6363,7 @@ msgid "untagged"
 msgstr "未标记"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr "有效 IP 地址"
 
@@ -6362,6 +6376,7 @@ msgid "valid IPv4 CIDR"
 msgstr "有效 IPv4 CIDR"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr "有效 IPv4 地址"
 
@@ -6390,6 +6405,7 @@ msgid "valid IPv6 CIDR"
 msgstr "有效 IPv6 CIDR"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr "有效 IPv6 地址"
 
@@ -6449,6 +6465,9 @@ msgstr "有效 host:port"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr "有效主机名"
 
@@ -6474,6 +6493,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr "有效端口或端口范围（port1-port2）"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr "有效端口值"
 
@@ -6521,6 +6541,18 @@ msgstr "是"
 msgid "« Back"
 msgstr "« 后退"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "指定了错误的地址！"
+
+#~ msgid "Install iputils-traceroute6 for IPv6 traceroute"
+#~ msgstr "安装 iputils-traceroute6 以进行 IPv6 路由追踪"
+
+#~ msgid "Loading"
+#~ msgstr "加载中"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "等待命令执行完成…"
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "分配接口…"
 
diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index ec0e62331..00367ee3e 100644
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -41,6 +41,8 @@ msgstr "(%d 分鐘資訊,每 %d 秒更新)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
+#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -147,15 +149,15 @@ msgstr ""
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:221
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> 查詢通訊埠"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> 伺服器通訊埠"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -165,7 +167,7 @@ msgstr "將會按照指定的順序查詢<abbr title=\"Domain Name System\">DNS<
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:452
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-位置"
@@ -191,12 +193,13 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-閘道"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:398
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:481
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 設定"
 
@@ -204,16 +207,16 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 設定"
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 名稱"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:408
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-位置"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:392
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:475
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:312
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -221,7 +224,7 @@ msgstr ""
 "<abbr title=\"maximal\">最大</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> 分配數量"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:321
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -229,7 +232,7 @@ msgstr ""
 "<abbr title=\"maximal\">最大</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> 封包大小"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:330
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">最大</abbr>同時查詢數量"
 
@@ -347,6 +350,7 @@ msgstr "啟用連線"
 msgid "Active DHCP Leases"
 msgstr "已分配的DHCP租用"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:49
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:92
 msgid "Active DHCPv6 Leases"
 msgstr "已分配的DHCPv6租用"
@@ -402,7 +406,7 @@ msgstr ""
 msgid "Add key"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:232
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "添加本地網域微碼到HOSTS檔案"
 
@@ -415,11 +419,11 @@ msgstr "增加新界面"
 msgid "Add peer"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "Additional Hosts files"
 msgstr "額外的HOST檔案"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:239
 msgid "Additional servers file"
 msgstr "額外的伺服器設定檔"
 
@@ -440,12 +444,13 @@ msgstr "位置"
 msgid "Address to access local relay bridge"
 msgstr "存取本地中繼橋接位置"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:29
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "管理"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:319
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:548
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:949
@@ -474,17 +479,17 @@ msgstr ""
 msgid "Alias of \"%s\""
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:247
 msgid "All Servers"
 msgstr "查詢所有伺服器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Allocate IP sequentially"
 msgstr ""
 
@@ -508,7 +513,7 @@ msgstr "允許舊型 802.11b 頻率"
 msgid "Allow listed only"
 msgstr "僅允許列表內"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:277
 msgid "Allow localhost"
 msgstr "允許本機"
 
@@ -524,7 +529,7 @@ msgstr "允許root登入"
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "允許 <em>root</em> 使用者登入"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:196
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr "允許127.0.0.0/8範圍內的上游回應，例如：RBL服務"
@@ -695,7 +700,7 @@ msgstr "認證"
 msgid "Authentication Type"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
 msgid "Authoritative"
 msgstr "授權"
 
@@ -703,11 +708,11 @@ msgstr "授權"
 msgid "Authorization Required"
 msgstr "請先登入"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:204
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:244
 msgid "Auto Refresh"
@@ -801,6 +806,7 @@ msgid "Backup"
 msgstr "備份"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "備份/升級韌體"
 
@@ -809,10 +815,6 @@ msgstr "備份/升級韌體"
 msgid "Backup file list"
 msgstr "備份檔列表"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:51
-msgid "Bad address specified!"
-msgstr "指定了錯誤的位置！"
-
 #: modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm:158
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:371
 msgid "Band"
@@ -832,7 +834,7 @@ msgstr ""
 "下面是待備份的檔案清單。包含了更改的設定檔案、必要的基本檔案和使用者自訂的備"
 "份檔案"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:290
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -852,7 +854,7 @@ msgstr ""
 msgid "Bitrate"
 msgstr "傳輸速率"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:250
 msgid "Bogus NX Domain Override"
 msgstr "忽略NX網域解析"
 
@@ -1042,10 +1044,11 @@ msgid "Close list..."
 msgstr "關閉清單"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:58
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2013
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386
 #: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:201
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:204
 msgid "Collecting data..."
 msgstr "收集資料中..."
 
@@ -1074,7 +1077,6 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:2467
-#: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js:416
 msgid "Configuration"
 msgstr "設定"
@@ -1114,7 +1116,7 @@ msgstr ""
 msgid "Connection lost"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:26
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:114
 msgid "Connections"
 msgstr "連線數"
 
@@ -1211,8 +1213,8 @@ msgstr ""
 msgid "DHCP Server"
 msgstr "DHCP伺服器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:45
 msgid "DHCP and DNS"
 msgstr "DHCP 和 DNS"
 
@@ -1247,7 +1249,7 @@ msgstr ""
 msgid "DNS"
 msgstr "網域名稱伺服器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "DNS forwardings"
 msgstr "DNS封包轉發"
 
@@ -1255,11 +1257,11 @@ msgstr "DNS封包轉發"
 msgid "DNS-Label / FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:212
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:135
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "DNSSEC check unsigned"
 msgstr ""
 
@@ -1288,6 +1290,7 @@ msgstr ""
 msgid "DTIM Interval"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:57
 msgid "DUID"
 msgstr "DHCP獨立式別碼DUID "
@@ -1428,8 +1431,7 @@ msgstr "無法連線到設備!"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "無法連線到設備! 正在持續等待設備回應..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:44
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78
 msgid "Diagnostics"
 msgstr "診斷"
 
@@ -1487,7 +1489,7 @@ msgstr "關閉"
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Discard upstream RFC1918 responses"
 msgstr "丟棄上游RFC1918 虛擬IP網路的回應"
 
@@ -1521,7 +1523,7 @@ msgstr "最佳化距離"
 msgid "Distance to farthest network member in meters."
 msgstr "到最遠的網路距離以米表示."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1532,15 +1534,15 @@ msgstr ""
 "abbr>-伺服器 和 <abbr title=\"Domain Name System\">DNS</abbr>-轉發給 <abbr "
 "title=\"Network Address Translation\">NAT</abbr> 防火牆用"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:155
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:236
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr "不快取拒絕的回應,例如.不存在的網域"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr "對不被公用名稱伺服器回應的請求不轉發"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
 msgid "Do not forward reverse lookups for local networks"
 msgstr "對本地網域不轉發反解析鎖定"
 
@@ -1560,11 +1562,11 @@ msgstr ""
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
 msgid "Domain required"
 msgstr "網域必要的"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
 msgid "Domain whitelist"
 msgstr "網域白名單"
 
@@ -1572,7 +1574,7 @@ msgstr "網域白名單"
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1717,7 +1719,7 @@ msgstr "啟用NTP同步功能"
 msgid "Enable Single DES"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:345
 msgid "Enable TFTP server"
 msgstr "啟用TFTP伺服器"
 
@@ -1837,11 +1839,11 @@ msgstr "乙太網路卡"
 msgid "Ethernet Switch"
 msgstr "乙太交換器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:383
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
 msgid "Expand hosts"
 msgstr "延伸主機"
 
@@ -1850,6 +1852,13 @@ msgid "Expecting an hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "Expecting: %s"
 msgstr ""
 
@@ -1927,7 +1936,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:358
 msgid "Filename of the boot image advertised to clients"
 msgstr "開機影像檔通知給用戶端"
 
@@ -1936,11 +1945,11 @@ msgstr "開機影像檔通知給用戶端"
 msgid "Filesystem"
 msgstr "檔案系統"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:197
 msgid "Filter private"
 msgstr "私人過濾器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:202
 msgid "Filter useless"
 msgstr "無用過濾器"
 
@@ -1963,7 +1972,7 @@ msgstr "搜尋並加入網路"
 msgid "Finish"
 msgstr "完成"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:12
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:12
 msgid "Firewall"
 msgstr "防火牆"
 
@@ -1987,7 +1996,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "防火牆版本"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:222
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Fixed source port for outbound DNS queries"
 msgstr "外發DNS請求的固定埠號"
 
@@ -2115,7 +2124,7 @@ msgstr ""
 msgid "Gateway metric"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:318
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
@@ -2154,9 +2163,9 @@ msgstr ""
 msgid "Global network options"
 msgstr "全域網路設定"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:176
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:65
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:234
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
 msgstr "前往密碼設定頁"
@@ -2207,6 +2216,7 @@ msgstr "隱藏 <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgid "Hide empty chains"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2007
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:126
@@ -2230,7 +2240,7 @@ msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
@@ -2243,7 +2253,7 @@ msgid "Hostname to send when requesting DHCP"
 msgstr "當請求DHCP服務時傳送的主機名稱"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:34
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:57
 msgid "Hostnames"
 msgstr "主機名稱"
 
@@ -2281,13 +2291,13 @@ msgstr "IP位址不正確"
 msgid "IP address is missing"
 msgstr "缺少IP位址"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:80
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:81
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:82
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:83
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:84
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4版"
@@ -2355,6 +2365,8 @@ msgstr ""
 msgid "IPv4/IPv6 (both - defaults to IPv4)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:85
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:86
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:87
@@ -2365,8 +2377,6 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6版"
@@ -2436,6 +2446,7 @@ msgstr ""
 msgid "IPv6 suffix"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:56
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:132
 msgid "IPv6-Address"
@@ -2531,7 +2542,7 @@ msgstr ""
 "緩慢的過程,作為交換裝置不能用高數據速率訪問該<abbr title=\"Random Access "
 "Memory\">RAM</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "不使用 <code>/etc/hosts</code>"
 
@@ -2539,7 +2550,7 @@ msgstr "不使用 <code>/etc/hosts</code>"
 msgid "Ignore interface"
 msgstr "被忽視的介面"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
 msgid "Ignore resolve file"
 msgstr "不使用解析檔"
 
@@ -2591,10 +2602,6 @@ msgstr "初始化腳本"
 msgid "Initscripts"
 msgstr "初始化腳本"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:98
-msgid "Install iputils-traceroute6 for IPv6 traceroute"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
 msgid "Install protocol extensions..."
 msgstr "安裝延伸協定中..."
@@ -2656,7 +2663,7 @@ msgstr "介面尚未出現或者還沒連上"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:303
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:330
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:36
 msgid "Interfaces"
 msgstr "介面"
 
@@ -2712,9 +2719,9 @@ msgid ""
 "flash memory, please verify the image file!"
 msgstr "它顯示您正嘗試更新不適用於這個flash記憶體的映像檔,請檢查確認這個映像檔"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:183
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:221
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:72
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:291
 msgid "JavaScript required!"
 msgstr "需要Java腳本"
@@ -2735,8 +2742,8 @@ msgstr ""
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:18
 #: modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:56
 msgid "Kernel Log"
 msgstr "核心日誌"
 
@@ -2812,16 +2819,17 @@ msgstr ""
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:472
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
 msgid "Lease time"
 msgstr "租賃時間長度"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:85
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "租賃檔案"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
 msgid "Leasetime remaining"
@@ -2848,11 +2856,11 @@ msgstr "圖例:"
 msgid "Limit"
 msgstr "限制"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:284
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:366
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:296
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2876,7 +2884,7 @@ msgstr ""
 msgid "Link On"
 msgstr "鏈接"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:262
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2904,15 +2912,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:203
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:285
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "列出允許RFC1918文件虛擬IP回應的網域"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "列出供應偽裝NX網域成果的主機群"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
 msgid "Listen Interfaces"
 msgstr ""
 
@@ -2924,12 +2932,12 @@ msgstr ""
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr "只許在給予的介面上聆聽, 如果未指定, 全都允許"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:213
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:295
 msgid "Listening port for inbound DNS queries"
 msgstr "進入的DNS請求聆聽埠"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:23
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:202
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:203
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:84
 msgid "Load"
 msgstr "掛載"
 
@@ -2937,10 +2945,6 @@ msgstr "掛載"
 msgid "Load Average"
 msgstr "平均掛載"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
-msgid "Loading"
-msgstr "讀取中"
-
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -2973,7 +2977,7 @@ msgstr "本地IPv4位址"
 msgid "Local IPv6 address"
 msgstr "本地IPv6位址"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:283
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:365
 msgid "Local Service Only"
 msgstr ""
 
@@ -2986,32 +2990,32 @@ msgstr "本地啟動"
 msgid "Local Time"
 msgstr "本地時間"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:227
 msgid "Local domain"
 msgstr "本地網域"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
 #, fuzzy
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
 msgstr "本地網域格式. 僅限符合從未從DHCP或hosts檔轉發和解析的網域"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:228
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr "本地網域後綴附加倒DHCP名稱和hosts檔項目"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:223
 msgid "Local server"
 msgstr "本地伺服器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:208
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
 msgstr "若有多個IP可用, 本地化主機名稱端看請求的子網路而言."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "Localise queries"
 msgstr "本地化網路請求"
 
@@ -3019,7 +3023,7 @@ msgstr "本地化網路請求"
 msgid "Log output level"
 msgstr "日誌輸出等級"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:258
 msgid "Log queries"
 msgstr "日誌查詢"
 
@@ -3031,7 +3035,7 @@ msgstr "系統日誌"
 msgid "Login"
 msgstr "登入"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:82
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:83
 msgid "Logout"
 msgstr "登出"
 
@@ -3128,15 +3132,15 @@ msgstr ""
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:231
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:313
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "允許啟用DHCP釋放的最大數量"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:331
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "允許同時齊發的DNS請求的最大數量"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:322
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "允許EDNS.0 協定的UDP封包最大數量"
 
@@ -3276,6 +3280,7 @@ msgstr "掛載點"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "掛載設定"
 
@@ -3367,11 +3372,10 @@ msgstr "名稱"
 msgid "Name of the new network"
 msgstr "新網路的名稱"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:199
 msgid "Navigation"
 msgstr "導覽"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:869
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2005
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:378
@@ -3379,14 +3383,15 @@ msgstr "導覽"
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:124
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:54
 msgid "Network"
 msgstr "網路"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:66
 msgid "Network Utilities"
 msgstr "網路多項工具"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:275
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:357
 msgid "Network boot image"
 msgstr "網路開機映像檔"
 
@@ -3444,13 +3449,13 @@ msgstr "尚無可運用資訊"
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "No negative cache"
 msgstr "拒絕無效網域的快取"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:173
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:211
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:238
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:62
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:231
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:279
 msgid "No password set!"
 msgstr "尚未設定密碼!"
@@ -3496,7 +3501,7 @@ msgstr "雜訊比:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:289
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
 msgid "Non-wildcard"
 msgstr ""
 
@@ -3538,11 +3543,11 @@ msgstr ""
 msgid "Notice"
 msgstr "通知"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:125
 msgid "Nslookup"
 msgstr "DNS偵錯Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:339
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr "快取DNS項目數量(最大值為10000,輸入0代表不快取)"
 
@@ -3589,7 +3594,7 @@ msgstr ""
 msgid "On-State Delay"
 msgstr "點亮狀態間隔"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:461
 msgid "One of hostname or mac address must be specified!"
 msgstr "主機名稱或mac位址任選一個被指定"
 
@@ -3764,7 +3769,7 @@ msgstr "覆蓋傳送到客戶端的子網路遮罩. 正常來說它會計算來�
 msgid "Override the table used for internal routes"
 msgstr "覆蓋之前內部使用的路由表"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:10
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:3
 msgid "Overview"
 msgstr "預覽"
 
@@ -3992,8 +3997,9 @@ msgstr "傳輸率:"
 msgid "Physical Settings"
 msgstr "實體設置"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:79
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:88
 msgid "Ping"
 msgstr "Ping"
 
@@ -4069,7 +4075,7 @@ msgid ""
 "ignore failures"
 msgstr "假若在給于多次的 LCP 呼叫失敗後終點將死, 使用0忽略失敗"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:301
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:384
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
@@ -4082,7 +4088,7 @@ msgid "Private Key"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:63
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:19
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:66
 msgid "Processes"
 msgstr "執行緒"
 
@@ -4139,7 +4145,7 @@ msgstr ""
 msgid "Quality"
 msgstr "品質"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:248
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4206,7 +4212,7 @@ msgstr "Radius-驗証-伺服器"
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:82
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4218,7 +4224,7 @@ msgstr ""
 msgid "Really switch protocol?"
 msgstr "確定要更換協定?"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:21
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:75
 msgid "Realtime Graphs"
 msgstr "即時圖表"
 
@@ -4226,12 +4232,13 @@ msgstr "即時圖表"
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "Rebind protection"
 msgstr "重新綁護"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "重開機"
 
@@ -4359,7 +4366,7 @@ msgid ""
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:136
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4405,11 +4412,11 @@ msgstr "重置計數器"
 msgid "Reset to defaults"
 msgstr "回復預設值"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:147
 msgid "Resolv and Hosts Files"
 msgstr "解析和Hosts檔案"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Resolve file"
 msgstr "解析檔"
 
@@ -4461,7 +4468,7 @@ msgstr ""
 msgid "Reverting configuration…"
 msgstr "正在還原設定值..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:267
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:349
 msgid "Root directory for files served via TFTP"
 msgstr "透過TFTP存取根目錄檔案"
 
@@ -4487,12 +4494,13 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "路由器密碼"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:14
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:16
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:37
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:37
 msgid "Routes"
 msgstr "路由"
 
@@ -4528,6 +4536,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH存取"
 
@@ -4545,6 +4554,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH-金鑰"
 
@@ -4589,6 +4599,7 @@ msgstr "掃描"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "排程任務"
 
@@ -4628,7 +4639,7 @@ msgid ""
 "conjunction with failure threshold"
 msgstr "傳送LCP呼叫請求在這個給予的秒數間隔內, 僅影響關聯到失敗門檻"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:142
 msgid "Server Settings"
 msgstr "伺服器設定值"
 
@@ -4641,7 +4652,7 @@ msgstr "服務名稱"
 msgid "Service Type"
 msgstr "服務型態"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
 msgstr "各服務"
 
@@ -4732,7 +4743,7 @@ msgstr "信號:"
 msgid "Size"
 msgstr "大小"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:256
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:338
 msgid "Size of DNS query cache"
 msgstr "DNS請求快取大小"
 
@@ -4745,11 +4756,11 @@ msgstr ""
 msgid "Skip"
 msgstr "跳過"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:195
 msgid "Skip to content"
 msgstr "跳到內容"
 
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:193
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:194
 msgid "Skip to navigation"
 msgstr "跳到導覽"
 
@@ -4852,6 +4863,7 @@ msgstr "開始無線掃描..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "開機自動執行"
 
@@ -4863,11 +4875,11 @@ msgstr "靜態IPv4路由"
 msgid "Static IPv6 Routes"
 msgstr "靜態IPv6路由"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Static Leases"
 msgstr "靜態租約"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:39
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:69
 msgid "Static Routes"
 msgstr "靜態路由"
 
@@ -4877,7 +4889,7 @@ msgstr "靜態路由"
 msgid "Static address"
 msgstr "靜態位址"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:388
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4890,10 +4902,10 @@ msgstr ""
 msgid "Station inactivity limit"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:380
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:781
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:9
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:16
 msgid "Status"
 msgstr "狀態"
 
@@ -4903,7 +4915,7 @@ msgstr "狀態"
 msgid "Stop"
 msgstr "停止"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid "Strict order"
 msgstr "嚴謹順序"
 
@@ -4916,11 +4928,11 @@ msgstr ""
 msgid "Submit"
 msgstr "提交"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:187
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:188
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4929,7 +4941,7 @@ msgid "Swap free"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:136
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:11
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:3
 msgid "Switch"
 msgstr "交換器"
 
@@ -4977,15 +4989,16 @@ msgstr ""
 msgid "Sync with browser"
 msgstr "與瀏覽器同步時間"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js:16
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
+#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "系統"
 
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:17
 #: modules/luci-mod-status/luasrc/view/admin_status/syslog.htm:8
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:46
 msgid "System Log"
 msgstr "系統日誌"
 
@@ -5001,11 +5014,11 @@ msgstr "系統日誌緩衝大小"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:148
 msgid "TFTP Settings"
 msgstr "TFTP設定"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:266
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:348
 msgid "TFTP server root"
 msgstr "TFTP 伺服器根"
 
@@ -5235,7 +5248,8 @@ msgid ""
 msgstr ""
 "以上傳的映像檔不包含支援格式. 請確認您選擇的是針對您的平台採用的通用映像檔."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:512
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:544
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:51
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
 msgid "There are no active leases"
@@ -5245,9 +5259,9 @@ msgstr ""
 msgid "There are no changes to apply"
 msgstr ""
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:174
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:212
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:239
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:63
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:213
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:282
 msgid ""
 "There is no password set on this router. Please configure a root password to "
@@ -5266,7 +5280,7 @@ msgstr ""
 msgid "This does not look like a valid PEM file"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:240
 msgid ""
 "This file may contain lines like 'server=/domain/1.2.3.4' or "
 "'server=1.2.3.4' for domain-specific or full upstream <abbr title=\"Domain "
@@ -5303,7 +5317,7 @@ msgid ""
 "ends with <code>...:2/64</code>"
 msgstr "這是由通道代理人指定的本地終端位址, 通常用 <code>...:2/64</code>結尾."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5375,14 +5389,15 @@ msgstr ""
 msgid "Total Available"
 msgstr "全部可用"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js:111
 msgid "Traceroute"
 msgstr "路由追蹤"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:93
 msgid "Traffic"
 msgstr "流量"
 
@@ -5610,7 +5625,7 @@ msgstr ""
 msgid "Uptime"
 msgstr "上傳花費時間"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:81
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Use <code>/etc/ethers</code>"
 msgstr "採用 <code>/etc/ethers</code>"
 
@@ -5721,7 +5736,7 @@ msgstr "使用閘道公測數"
 msgid "Use routing table"
 msgstr "使用路由表"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:306
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:389
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 "em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "
@@ -5773,7 +5788,7 @@ msgstr ""
 msgid "VLANs on %q"
 msgstr "VLAN 在 %q"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:36
 msgid "VPN"
 msgstr ""
 
@@ -5853,10 +5868,6 @@ msgstr ""
 "WPA-加密需要 wpa_supplican(終端模式)或者hostapd熱點(對AP或者是 ad-hoc模式)已"
 "被安裝."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:34
-msgid "Waiting for command to complete..."
-msgstr "等待完整性指令..."
-
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:40
 msgid "Waiting for device..."
 msgstr "正在等待裝置..."
@@ -5891,9 +5902,9 @@ msgstr ""
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:14
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:77
-#: modules/luci-mod-status/luasrc/controller/admin/status.lua:25
+#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:16
+#: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:102
 msgid "Wireless"
 msgstr "無線網路"
 
@@ -5941,7 +5952,7 @@ msgstr "無線網路已停用"
 msgid "Wireless network is enabled"
 msgstr "無線網路已啟用"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
 msgid "Write received DNS requests to syslog"
 msgstr "寫入已接收的DNS請求到系統日誌中"
 
@@ -5969,9 +5980,9 @@ msgstr ""
 "您可以開啟或關閉初始化指令在這. 修改將會在設備重開後被啟用. <br /><strong>警"
 "告: 假如您關閉必要的初始化腳本像\"網路\", 您的設備將可能無法存取!</strong>"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:222
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:232
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:73
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:223
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:294
 msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
@@ -5993,7 +6004,7 @@ msgstr ""
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
 msgid "any"
 msgstr "任意"
 
@@ -6082,13 +6093,14 @@ msgstr "已停用"
 msgid "driver default"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:522
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:41
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:68
 msgid "expired"
 msgstr "過期"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6142,7 +6154,7 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:93
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "本地<abbr title=\"Domain Name System\">DNS</abbr> 檔案"
 
@@ -6179,16 +6191,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:342
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:811
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:815
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:163
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:194
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:52
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:197
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:207
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:245
 msgid "off"
 msgstr "關閉"
 
-#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:162
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:193
-#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:205
+#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:51
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:196
+#: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:206
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:242
 msgid "on"
 msgstr "開啟"
@@ -6266,8 +6278,9 @@ msgstr ""
 msgid "unknown"
 msgstr "未知"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:410
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:520
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:39
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:66
 msgid "unlimited"
@@ -6295,6 +6308,7 @@ msgid "untagged"
 msgstr "尚未標籤"
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:115
 msgid "valid IP address"
 msgstr ""
 
@@ -6307,6 +6321,7 @@ msgid "valid IPv4 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:249
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
 msgid "valid IPv4 address"
 msgstr ""
 
@@ -6335,6 +6350,7 @@ msgid "valid IPv6 CIDR"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "valid IPv6 address"
 msgstr ""
 
@@ -6394,6 +6410,9 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:350
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:352
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:101
 msgid "valid hostname"
 msgstr ""
 
@@ -6419,6 +6438,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:319
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:121
 msgid "valid port value"
 msgstr ""
 
@@ -6466,6 +6486,15 @@ msgstr "是的"
 msgid "« Back"
 msgstr "« 倒退"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "指定了錯誤的位置！"
+
+#~ msgid "Loading"
+#~ msgstr "讀取中"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "等待完整性指令..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "分配界面..."
author	Jo-Philipp Wich <jo@mein.io>	2019-12-16 18:18:01 +0100
committer	Jo-Philipp Wich <jo@mein.io>	2019-12-16 18:18:01 +0100
commit	fc35802ff993102fafbf93694a6e1cb5c5447b02 (patch)
tree	52c64795bcf93243a5294d6e7ef32e912f25289e
parent	bdcd08f4abc87d59acb5395be0ad466b3b609e11 (diff)