Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
index d6c5ac54c0217307b48cbb29556dbf3d53654b39..edef8a0493179a92824217c6b1f5f0b95e62b6c7 100644 (file)
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -114,7 +114,7 @@ e2.enabled = "10"
 e2.rmempty = false
 
 e3 = e:option(Flag, "adb_forcedns", translate("Force Local DNS"),
-       translate("Redirect all DNS queries from 'lan' zone to the local resolver, applies to udp and tcp protocol on ports 53, 853 and 5353."))
+       translate("Redirect all DNS queries from 'lan' zone to the local resolver, applies to UDP and TCP protocol on port 53, 853 and 5353."))
 e3.rmempty = false
 
 e4 = e:option(Value, "adb_maxqueue", translate("Max. Download Queue"),
@@ -132,7 +132,7 @@ e5.enabled = "true"
 e5.rmempty = false
 
 e6 = e:option(Flag, "adb_report", translate("DNS Query Report"),
-       translate("Gather dns related network traffic via tcpdump to provide a DNS Query Report on demand. ")
+       translate("Gather DNS related network traffic via tcpdump to provide a DNS Query Report on demand. ")
        ..translate("Please note: this needs manual 'tcpdump-mini' package installation."))
 e6.rmempty = false
 
@@ -150,12 +150,12 @@ e8.default = "/tmp"
 e8.rmempty = true
 
 e9 = e:option(Flag, "adb_mail", translate("E-Mail Notification"),
-       translate("Send notification E-Mails in case of a processing error or if domain count is ≤ 0. ")
+       translate("Send notification e-mails in case of a processing error or if domain count is ≤ 0. ")
        .. translate("Please note: this needs manual 'msmtp' package installation and setup."))
 e9.rmempty = true
 
 e10 = e:option(Value, "adb_mreceiver", translate("E-Mail Receiver Address"),
-       translate("Receiver address for adblock notification E-Mails."))
+       translate("Receiver address for adblock notification e-mails."))
 e10:depends("adb_mail", 1)
 e10.rmempty = true
 
@@ -195,13 +195,13 @@ e25.default = "53 853 5353"
 e25.optional = true
 
 e26 = e:option(Flag, "adb_dnsinotify", translate("DNS Inotify"),
-       translate("Disable adblock triggered restarts and the 'DNS File Reset' for dns backends with autoload features."))
+       translate("Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends with autoload features."))
 e26.default = nil
 e26.enabled = "true"
 e26.optional = true
 
 e27 = e:option(Flag, "adb_dnsflush", translate("Flush DNS Cache"),
-       translate("Flush DNS Cache after adblock processing."))
+       translate("Flush DNS cache after adblock processing."))
 e27.default = nil
 e27.optional = true
 
@@ -242,24 +242,24 @@ e31.datatype = "range(1,10)"
 e31.default = 1
 e31.optional = true
 
-e32 = e:option(Value, "adb_msender", translate("E-Mail Sender Address"),
-       translate("Sender address for adblock notification E-Mails."))
+e32 = e:option(Value, "adb_msender", translate("E-mail Sender Address"),
+       translate("Sender address for adblock notification e-mails."))
 e32.default = "no-reply@adblock"
 e32.optional = true
 
-e33 = e:option(Value, "adb_mtopic", translate("E-Mail Topic"),
-       translate("Topic for adblock notification E-Mails."))
+e33 = e:option(Value, "adb_mtopic", translate("E-mail Topic"),
+       translate("Topic for adblock notification e-mails."))
 e33.default = "adblock notification"
 e33.optional = true
 
-e34 = e:option(Value, "adb_mprofile", translate("E-Mail Profile"),
-       translate("Mail profile used in 'msmtp' for adblock notification E-Mails."))
+e34 = e:option(Value, "adb_mprofile", translate("E-mail Profile"),
+       translate("Mail profile used in 'msmtp' for adblock notification e-mails."))
 e34.default = "adb_notify"
 e34.optional = true
 
-e35 = e:option(Value, "adb_mcnt", translate("E-Mail Notification Count"),
-       translate("Raise the minimum notification count, to get E-Mails if the overall count is less or equal to the given limit (default 0), ")
-       .. translate("e.g. to receive an E-Mail notification with every adblock run set this value to 200000."))
+e35 = e:option(Value, "adb_mcnt", translate("E-mail Notification Count"),
+       translate("Raise the minimum notification count, to get e-mails if the overall count is less or equal to the given limit (default 0), ")
+       .. translate("e.g. to receive an e-mail notification with every adblock run set this value to 200000."))
 e35.default = 0
 e35.datatype = "min(0)"
 e35.optional = true

diff --git a/applications/luci-app-adblock/po/bg/adblock.po b/applications/luci-app-adblock/po/bg/adblock.po
index abc7656f37b35881f9e489eb0dac7644200591e5..6a29e239b1874cf2a7d1f7b24c8cd71e9f912489 100644 (file)
--- a/applications/luci-app-adblock/po/bg/adblock.po
+++ b/applications/luci-app-adblock/po/bg/adblock.po
@@ -148,7 +148,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -187,24 +187,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -254,7 +254,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -283,7 +283,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -341,7 +341,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -401,18 +401,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -490,12 +490,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -620,7 +620,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -653,6 +653,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/ca/adblock.po b/applications/luci-app-adblock/po/ca/adblock.po
index 382e8f2b4f896d6e839741d232fca8d47bd14af0..bd275f901fb29f5c26421d71fe251dca3e12996a 100644 (file)
--- a/applications/luci-app-adblock/po/ca/adblock.po
+++ b/applications/luci-app-adblock/po/ca/adblock.po
@@ -163,7 +163,7 @@ msgstr "Descripció"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -202,24 +202,24 @@ msgstr "Utilitat de baixades (biblioteca SSL)"
 msgid "E-Mail Notification"
 msgstr "Notificació per correu"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "Adreça de destinatari de correu"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "Recompte de notificacions per correu"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "Perfil de correu"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "Adreça de destinatari de correu"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "Adreça de remitent de correu"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "Tema de correu"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -271,7 +271,7 @@ msgid "Flush DNS Cache"
 msgstr "Purga la memòria cau del DNS"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "Purga la memòria cau del DNS després del processament del blocador."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -304,7 +304,7 @@ msgstr "Camí complet al fitxer de llista blanca."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -362,7 +362,7 @@ msgid "Low Priority Service"
 msgstr "Servei de prioritat baixa"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -426,18 +426,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -515,12 +515,12 @@ msgstr "Desa"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -588,8 +588,8 @@ msgstr ""
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:18
 msgid "The file size is too large for online editing in LuCI (≥ 100 KB)."
 msgstr ""
-"Aquest fitxer és massa gran i no es pot editar en línia amb el LuCI (≥ "
-"100 kB)."
+"Aquest fitxer és massa gran i no es pot editar en línia amb el LuCI "
+"(≥ 100 kB)."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/logread.htm:31
 msgid "The syslog output, pre-filtered for adblock related messages only."
@@ -655,7 +655,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -688,6 +688,6 @@ msgstr "Sí"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/cs/adblock.po b/applications/luci-app-adblock/po/cs/adblock.po
index 57416ce9b7ed3ec768e704950019d2dc2f3667be..1b19ab9d7831f1a044ff15102e7edce789d7d809 100644 (file)
--- a/applications/luci-app-adblock/po/cs/adblock.po
+++ b/applications/luci-app-adblock/po/cs/adblock.po
@@ -162,7 +162,7 @@ msgstr "Popis"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 "Zakázat restartování spouštěné adblockem a „Resetování DNS souboru“ pro "
@@ -207,24 +207,24 @@ msgstr "Nástroj pro stahování (knihovna SSL)"
 msgid "E-Mail Notification"
 msgstr "Oznámení e-mailem"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "Adresa příjemce e-mailu"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "Počet e-mailových oznámení"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "E-mailový profil"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "Adresa příjemce e-mailu"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "Adresa odesílatele e-mailu"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "Téma e-mailu"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -278,7 +278,7 @@ msgid "Flush DNS Cache"
 msgstr "Vyprázdnit mezipaměť DNS"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "Vyprázdnit mezipaměť DNS po zpracování blokování reklam."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -311,7 +311,7 @@ msgstr "Úplná cesta k souboru se seznamem povolených serverů."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 "Shromažďovat síťový provoz související s DNS pomocí tcpdump. Umožní na "
@@ -355,7 +355,8 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
 msgid "List of supported and fully pre-configured download utilities."
-msgstr "Seznam podporovaných a plně předkonfigurovaných nástrojů pro stahování."
+msgstr ""
+"Seznam podporovaných a plně předkonfigurovaných nástrojů pro stahování."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
@@ -376,7 +377,7 @@ msgid "Low Priority Service"
 msgstr "Služba s nízkou prioritou"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 "Profil používaný v e-mailovém klientu 'msmtp' pro e-maily s upozorněním na "
 "blokování."
@@ -440,20 +441,20 @@ msgstr "Dotazové domény"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 "Zvyšte minimální počet oznámení, abyste obdrželi e-maily, pokud je celkový "
 "počet menší nebo roven danému limitu (výchozí 0),"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr "Adresa příjemce pro e-maily s upozorněním."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 "Přesměrovat všechny dotazy DNS z 'lan' zóny na místní resolver. Platí pro "
 "protokol UDP a TCP na portech 53, 853 a 5353."
@@ -535,14 +536,14 @@ msgstr "Uložit"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 "Odesílat e-maily s oznámením v případě chyby zpracování nebo v případě, že "
 "počet domén je ≤ 0."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr "Adresa odesílatele pro e-maily s upozorněním."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -687,7 +688,7 @@ msgid "Top 10 Reporting"
 msgstr "10 nejčastějších hlášení"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr "Předmět notifikačních e-mailů."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -720,7 +721,7 @@ msgstr "Ano"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""
 "např. chcete-li dostávat upozornění e-mailem při každém spuštění adblocku, "

diff --git a/applications/luci-app-adblock/po/de/adblock.po b/applications/luci-app-adblock/po/de/adblock.po
index 4e7fbac79503a9d5f12762538e2aa992077e4040..efb1db38acc826ea10bdbcf7375cbccea2c12c91 100644 (file)
--- a/applications/luci-app-adblock/po/de/adblock.po
+++ b/applications/luci-app-adblock/po/de/adblock.po
@@ -162,7 +162,7 @@ msgstr "Beschreibung"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 "Deaktivieren von adblockgesteuerten Neustarts und 'DNS File Reset' für DNS-"
@@ -207,24 +207,24 @@ msgstr "Download-Werkzeug (SSL-Bibliothek)"
 msgid "E-Mail Notification"
 msgstr "E-Mail-Benachrichtigung"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "E-Mail-Empfängeradresse"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "E-Mail-Benachrichtigungsanzahl"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "E-Mail-Profil"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "E-Mail-Empfängeradresse"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "E-Mail-Absenderadresse"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "E-Mail-Thema"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -278,7 +278,7 @@ msgid "Flush DNS Cache"
 msgstr "DNS-Cache leeren"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "Leeren des DNS-Caches nach der Adblockverarbeitung."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -311,7 +311,7 @@ msgstr "Vollständiger Pfad zur Datei der Positivliste."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 "DNS-bezogenen Netzwerkverkehr über tcpdump sammeln, um bei Bedarf einen DNS-"
@@ -379,7 +379,7 @@ msgid "Low Priority Service"
 msgstr "Dienst mit niedriger Priorität"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 "Mail-Profil, das in 'msmtp' für Adblock-Benachrichtigs-E-Mails verwendet "
 "wird."
@@ -449,7 +449,7 @@ msgstr "Domainabfrage"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 "Erhöhe die minimale Anzahl der Benachrichtigungen, um E-Mails zu erhalten, "
@@ -457,13 +457,13 @@ msgstr ""
 "0),"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr "Empfängeradresse für Adblock-Benachrichtigungs-E-Mails."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 "Leitet alle DNS-Abfragen von der Zone 'lan' an den lokalen Resolver weiter, "
 "gilt für die Protokolle UDP und TCP auf den Ports 53, 853 und 5353."
@@ -547,14 +547,14 @@ msgstr "Speichern"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 "Sende Benachrichtigungs-E-Mails im Falle eines Verarbeitungsfehlers oder "
 "wenn die Domainanzahl ≤ 0 ist."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr "Absenderadresse für Adblock-Benachrichtigungs-E-Mails."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -707,7 +707,7 @@ msgid "Top 10 Reporting"
 msgstr "Top 10 der Berichterstattung"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr "Betreff für Adblock-Benachrichtigungs-E-Mails."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -740,7 +740,7 @@ msgstr "Ja"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""
 "um z.B. eine E-Mail-Benachrichtigung mit jedem Adblock-Lauf zu erhalten, "

diff --git a/applications/luci-app-adblock/po/el/adblock.po b/applications/luci-app-adblock/po/el/adblock.po
index 2a1f3a4dbd6f0a7636975acd4174da38fdb7ae5f..acc6c797504f59253781d383d1d30ca91883b414 100644 (file)
--- a/applications/luci-app-adblock/po/el/adblock.po
+++ b/applications/luci-app-adblock/po/el/adblock.po
@@ -154,7 +154,7 @@ msgstr "Περιγραφή"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -193,24 +193,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -260,7 +260,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -289,7 +289,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -347,7 +347,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -407,18 +407,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -496,12 +496,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -626,7 +626,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -659,6 +659,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/en/adblock.po b/applications/luci-app-adblock/po/en/adblock.po
index 937162e7e62af7948e776fef7d2ce3a73a74b05a..cdbb80f967408bcdf89a7b9e11f71031fe6e8a03 100644 (file)
--- a/applications/luci-app-adblock/po/en/adblock.po
+++ b/applications/luci-app-adblock/po/en/adblock.po
@@ -148,7 +148,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -187,24 +187,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -254,7 +254,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -283,7 +283,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -341,7 +341,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -401,18 +401,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -490,12 +490,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -620,7 +620,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -653,6 +653,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/es/adblock.po b/applications/luci-app-adblock/po/es/adblock.po
index 200e6f1537feff9fc7d9b980556e042686d2e5f1..667d84d7ab8f6abb2a9afae5e08b45a33b3daa2b 100644 (file)
--- a/applications/luci-app-adblock/po/es/adblock.po
+++ b/applications/luci-app-adblock/po/es/adblock.po
@@ -166,7 +166,7 @@ msgstr "Descripción"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 "Desactive los reinicios activados por adblock y el 'Restablecimiento de "
@@ -211,24 +211,24 @@ msgstr "Utilidad de descarga (Biblioteca SSL)"
 msgid "E-Mail Notification"
 msgstr "Notificación del E-Mail"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "Dirección del destinatario del E-Mail"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "Conteo de notificaciones por E-Mail"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "Perfil del E-Mail"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "Dirección del destinatario del E-Mail"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "Dirección del remitente del E-Mail"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "Tema del E-Mail"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -282,7 +282,7 @@ msgid "Flush DNS Cache"
 msgstr "Vaciar caché de DNS"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "Vaciar el caché de DNS después del procesamiento de adblock."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -315,7 +315,7 @@ msgstr "Ruta completa al archivo de la lista blanca."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 "Reúne el tráfico de red relacionado con DNS a través de tcpdump para "
@@ -382,7 +382,7 @@ msgid "Low Priority Service"
 msgstr "Servicio con prioridad baja"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 "Perfil de correo utilizado en 'msmtp' para notificaciones de E-Mails de "
 "adblock."
@@ -453,20 +453,20 @@ msgstr "Dominios de consulta"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 "Aumente el recuento mínimo de notificaciones para obtener E-Mails si el "
 "recuento general es menor o igual al límite dado (valor predeterminado 0),"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr "Dirección del receptor para la notificación de bloqueos electrónicos."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 "Redireccionar todas las consultas DNS desde la zona 'lan' al resolvedor "
 "local, se aplica al protocolo udp y tcp en los puertos 53, 853 y 5353."
@@ -553,14 +553,14 @@ msgstr "Guardar"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 "Enviar notificaciones por E-Mail en caso de un error de procesamiento o si "
 "el recuento de dominios es &le 0."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr "Dirección del remitente para los E-Mails de notificación de adblock."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -717,7 +717,7 @@ msgid "Top 10 Reporting"
 msgstr "Top 10 de informes"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr "Tema para la notificación de bloqueos de E-Mails."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -750,7 +750,7 @@ msgstr "Si"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""
 "p.ej. para recibir una notificación por E-Mail con cada ejecución de bloque "
@@ -807,7 +807,7 @@ msgstr ""
 
 #~ msgid ""
 #~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
-#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ "UDP and TCP protocol on port 53, 853 and 5353."
 #~ msgstr ""
 #~ "Redirije todas las consultas de DNS de la zona 'lan' a la resolución "
 #~ "local, aplíquelas a los protocolos udp y tcp en los puertos 53, 853 y "

diff --git a/applications/luci-app-adblock/po/fr/adblock.po b/applications/luci-app-adblock/po/fr/adblock.po
index 968fae55d538f5309c04f2aa60b5cfeb9def103c..493319e215593ed3a23f86d2063bea6d8768662d 100644 (file)
--- a/applications/luci-app-adblock/po/fr/adblock.po
+++ b/applications/luci-app-adblock/po/fr/adblock.po
@@ -164,7 +164,7 @@ msgstr "Description"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 "Désactiver le redémarrage automatique d'adblock ainsi que l'option \"DNS "
@@ -209,24 +209,24 @@ msgstr "Télécharger l'utilitaire (Bibliothèque SSL)"
 msgid "E-Mail Notification"
 msgstr "Notifications par e-mail"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "Adresse e-mail du destinataire"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "Nombre de notification par e-mail"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "Profil e-mail"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "Adresse e-mail du destinataire"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "Adresse e-mail de l'émetteur"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "Objet de l'e-mail"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -278,7 +278,7 @@ msgid "Flush DNS Cache"
 msgstr "Vider le cache DNS"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "Vider le cache du DNS après l'exécution du bloqueur de publicité."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -311,7 +311,7 @@ msgstr "Chemin complet vers le fichier de liste blanche."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 "Collecter le trafic réseau DNS via tcpdump pour fournir un Rapport de "
@@ -357,8 +357,8 @@ msgstr ""
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
 msgid "List of supported and fully pre-configured download utilities."
 msgstr ""
-"Liste des utilitaires de téléchargement pris en charge et entièrement "
-"pré-configurés."
+"Liste des utilitaires de téléchargement pris en charge et entièrement pré-"
+"configurés."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
@@ -379,7 +379,7 @@ msgid "Low Priority Service"
 msgstr "Service en priorité basse"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 "Profil de messagerie utilisé dans «msmtp» pour les e-mails de notification "
 "adblock."
@@ -445,12 +445,12 @@ msgstr "Interroger les domaines"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 "Adresse du destinataire pour les e-mails de notification du bloqueur de "
 "publicité."
@@ -458,7 +458,7 @@ msgstr ""
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -537,12 +537,12 @@ msgstr "Enregistrer"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -680,7 +680,7 @@ msgid "Top 10 Reporting"
 msgstr "Top 10 des rapports"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr "Sujet pour les e-mails de notification adblock."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -713,6 +713,6 @@ msgstr "Oui"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/he/adblock.po b/applications/luci-app-adblock/po/he/adblock.po
index 29e8c5456400b0fc91f56e86c224ba7bc732087b..dad5184d5bfa778f37dcd2a65293d1b84c6470bc 100644 (file)
--- a/applications/luci-app-adblock/po/he/adblock.po
+++ b/applications/luci-app-adblock/po/he/adblock.po
@@ -148,7 +148,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -187,24 +187,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -254,7 +254,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -283,7 +283,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -341,7 +341,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -401,18 +401,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -490,12 +490,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -620,7 +620,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -653,6 +653,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/hi/adblock.po b/applications/luci-app-adblock/po/hi/adblock.po
index bd372b0f128215e93debf022fd1bbd846ee3ab83..5553f5c50646db6279299043068b3187da78ccd1 100644 (file)
--- a/applications/luci-app-adblock/po/hi/adblock.po
+++ b/applications/luci-app-adblock/po/hi/adblock.po
@@ -148,7 +148,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -187,24 +187,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -254,7 +254,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -283,7 +283,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -341,7 +341,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -401,18 +401,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -490,12 +490,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -620,7 +620,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -653,6 +653,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/hu/adblock.po b/applications/luci-app-adblock/po/hu/adblock.po
index ca00ead2a84c5cbafc14b2b284f9f4b316cc316f..9d3fd559579df078b399f2afe945c80c66a3ce75 100644 (file)
--- a/applications/luci-app-adblock/po/hu/adblock.po
+++ b/applications/luci-app-adblock/po/hu/adblock.po
@@ -164,7 +164,7 @@ msgstr "Leírás"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 "A reklámblokkoló letiltása aktiválta az újraindításokat és a „DNS "
@@ -210,24 +210,24 @@ msgstr "Letöltési segédprogram (SSL programkönyvtár)"
 msgid "E-Mail Notification"
 msgstr "E-mail értesítés"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "E-mail fogadócím"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "E-mail értesítés darabszáma"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "E-mail profil"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "E-mail fogadócím"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "E-mail küldőcím"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "E-mail téma"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -281,7 +281,7 @@ msgid "Flush DNS Cache"
 msgstr "DNS gyorsítótár kiürítése"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "DNS gyorsítótár kiürítése a reklámblokkolás feldolgozása után."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -314,7 +314,7 @@ msgstr "Teljes útvonal a fehérlistafájlhoz."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 "A DNS-re vonatkozó hálózati forgalom begyűjtése tcpdump használatával egy "
@@ -381,10 +381,10 @@ msgid "Low Priority Service"
 msgstr "Alacsony prioritású szolgáltatás"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
-"Az „msmtp”-ben használt levelezési profil a reklámblokkoló értesítési "
-"e-mailekhez."
+"Az „msmtp”-ben használt levelezési profil a reklámblokkoló értesítési e-"
+"mailekhez."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
 msgid "Max. Download Queue"
@@ -448,21 +448,21 @@ msgstr "Tartományok lekérdezése"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 "Emelje meg a legkisebb értesítési darabszámot, hogy megkapja az e-maileket, "
-"ha az összesített darabszám kisebb vagy egyenlő a megadott korlátnál ("
-"alapértelmezetten 0)."
+"ha az összesített darabszám kisebb vagy egyenlő a megadott korlátnál "
+"(alapértelmezetten 0)."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr "Fogadó címe a reklámblokkoló értesítési e-mailekhez."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 "Az összes DNS-lekérdezés átirányítása a „lan” zónából a helyi feloldóhoz, "
 "alkalmazza az UDP és TCP protokollra az 53, 853 és 5353 számú portokon."
@@ -510,8 +510,8 @@ msgstr ""
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
 msgid "Report chunk size used by tcpdump in MB (default '1')."
 msgstr ""
-"A tcpdump által használt darabok méretének jelentése megabájtban ("
-"alapértelmezetten „1”)."
+"A tcpdump által használt darabok méretének jelentése megabájtban "
+"(alapértelmezetten „1”)."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
 msgid ""
@@ -549,14 +549,14 @@ msgstr "Mentés"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 "Értesítési e-mailek küldése feldolgozási hiba esetén, vagy ha a tartomány "
 "darabszáma kisebb mint 0."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr "Küldő címe a reklámblokkoló értesítési e-mailekhez."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -625,8 +625,8 @@ msgid ""
 "Target directory for dns related report files. Default is '/tmp', please use "
 "preferably a non-volatile disk if available."
 msgstr ""
-"Célkönyvtár a DNS-hez kapcsolódó jelentési fájlokhoz. Alapértelmezetten "
-"„/tmp”, használjon inkább tartósan megmaradó lemezt, ha elérhető."
+"Célkönyvtár a DNS-hez kapcsolódó jelentési fájlokhoz. Alapértelmezetten „/"
+"tmp”, használjon inkább tartósan megmaradó lemezt, ha elérhető."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
 msgid "Target directory for the generated blocklist 'adb_list.overall'."
@@ -712,7 +712,7 @@ msgid "Top 10 Reporting"
 msgstr "Leggyakoribb 10 jelentés"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr "Téma a reklámblokkoló értesítési e-mailekhez."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -745,7 +745,7 @@ msgstr "Igen"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""
 "például állítsa ezt az értéket 200000-re minden reklámblokkoló futásánál "

diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po
index c37bd5d04002f34dd46b91d17c14c004752cc38d..2d450d1d26a05165a0aa8ce6929a40bb6682ae20 100644 (file)
--- a/applications/luci-app-adblock/po/it/adblock.po
+++ b/applications/luci-app-adblock/po/it/adblock.po
@@ -163,7 +163,7 @@ msgstr "Descrizione"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 "Disabilita il riavvio dell'adblock e il 'Reset File DNS' per i backend DNS "
@@ -208,24 +208,24 @@ msgstr "Utilità di scaricamento (Libreria SSL)"
 msgid "E-Mail Notification"
 msgstr "Notifica E-Mail"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "E-Mail destinatario"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "Conto Notifica E-Mail"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "Profilo E-Mail"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "E-Mail destinatario"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "Indirizzo E-Mail mittente"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "Oggetto E-Mail"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -269,14 +269,15 @@ msgstr "Filtro"
 msgid ""
 "Filter the DNS Query result set for a particular domain, client or time "
 "frame."
-msgstr "Filtra i risultati in base a nome dominio, client o finestra temporale."
+msgstr ""
+"Filtra i risultati in base a nome dominio, client o finestra temporale."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
 msgid "Flush DNS Cache"
 msgstr "Pulisci Cache DNS"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "Pulisci Chache DNS dopo aver elaborato adblock."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -309,7 +310,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -367,8 +368,9 @@ msgid "Low Priority Service"
 msgstr "Serviio a bassa priorità"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
-msgstr "Profilo email utilizzato in 'msmtp' per le notifiche E-mail di adblock."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
+msgstr ""
+"Profilo email utilizzato in 'msmtp' per le notifiche E-mail di adblock."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
 msgid "Max. Download Queue"
@@ -434,18 +436,18 @@ msgstr "Interrogazione domini"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 "Reindirizza tutte le richieste DNS dalla zona 'lan' al risolvitore locale, "
 "si applica ai protocolli tcp e udp sulle porte 53,853 e 5353."
@@ -525,12 +527,12 @@ msgstr "Salva"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -661,7 +663,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -694,7 +696,7 @@ msgstr "Sì"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""
 

diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index dd8c8af143727e4b6b4dae1bf18c7d1cc87f8be0..c2a5b67a7cb76660583f2a5f0fba7dc20b269e9a 100644 (file)
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -162,7 +162,7 @@ msgstr "説明"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 "自動読み込み機能を持つ DNS バックエンドのため、adblockが引き起こす再起動と "
@@ -206,24 +206,24 @@ msgstr "ダウンロード ユーティリティ（SSL ライブラリ）"
 msgid "E-Mail Notification"
 msgstr "Eメール通知"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "Eメール受信アドレス"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "Eメール通知カウント"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "Eメール プロファイル"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "Eメール受信アドレス"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "Eメール送信アドレス"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "Eメール題名"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -276,7 +276,7 @@ msgid "Flush DNS Cache"
 msgstr "DNS キャッシュのクリア"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "Adblock 処理の後に DNS キャッシュをクリアします。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -309,7 +309,7 @@ msgstr "ホワイトリスト ファイルへのフルパスです。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 "tcpdump によって DNS 関連のネットワークトラフィックを収集し、 オンデマンドの"
@@ -375,7 +375,7 @@ msgid "Low Priority Service"
 msgstr "低優先度サービス"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 "adblock 通知メールのために 'msmtp' で使用される、メール プロファイルです。"
 
@@ -442,20 +442,20 @@ msgstr "ドメインの検索"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 "メール通知を行うメール通知カウントを設定します。全体カウントが指定された値以"
 "下の場合、メールを受け取ります。（規定値: 0）"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr "adblock 通知メールの受信アドレスです。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 "'lan' ゾーンからの全 DNS クエリをローカル リゾルバにリダイレクトします。これ"
 "は、53, 853, 5353 の各ポートにおける UDP, TCP プロトコルに適用されます。"
@@ -539,13 +539,13 @@ msgstr "保存"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 "処理エラーまたはドメイン カウントが 0 以下の場合、通知メールを送信します。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr "adblock 通知メールの送信アドレスです。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -696,7 +696,7 @@ msgid "Top 10 Reporting"
 msgstr "上位 10 レポート"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr "adblock 通知メールの題名です。"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -729,7 +729,7 @@ msgstr "はい"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""
 "例: adblock の実行ごとに Eメール通知を受け取るには、値を 200000 に設定しま"

diff --git a/applications/luci-app-adblock/po/ko/adblock.po b/applications/luci-app-adblock/po/ko/adblock.po
index a140cbd91286c4d6d3a75b9d77dabfd93cd5f6eb..39c8c3cb7b31b29dd7c6158b62dbdcce3c513cdc 100644 (file)
--- a/applications/luci-app-adblock/po/ko/adblock.po
+++ b/applications/luci-app-adblock/po/ko/adblock.po
@@ -148,7 +148,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -187,24 +187,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -254,7 +254,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -283,7 +283,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -341,7 +341,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -401,18 +401,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -490,12 +490,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -620,7 +620,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -653,6 +653,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/mr/adblock.po b/applications/luci-app-adblock/po/mr/adblock.po
index c6768fe09b58db4794f4eed5a95695e60a9c899b..d50dc1959c44cba10c0661f0f4af377a8765c1e9 100644 (file)
--- a/applications/luci-app-adblock/po/mr/adblock.po
+++ b/applications/luci-app-adblock/po/mr/adblock.po
@@ -154,7 +154,7 @@ msgstr "वर्णन"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -193,24 +193,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -260,7 +260,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -289,7 +289,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -347,7 +347,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -407,18 +407,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -496,12 +496,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -626,7 +626,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -659,6 +659,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/ms/adblock.po b/applications/luci-app-adblock/po/ms/adblock.po
index f85f12e59a9867201de835fa98b4425a138d5b4f..8683d51d613fb96bfe65e1635583b87e7534c3bd 100644 (file)
--- a/applications/luci-app-adblock/po/ms/adblock.po
+++ b/applications/luci-app-adblock/po/ms/adblock.po
@@ -161,7 +161,7 @@ msgstr "Keterangan"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -200,24 +200,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -267,7 +267,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -296,7 +296,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -354,7 +354,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -414,18 +414,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -503,12 +503,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -633,7 +633,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -666,6 +666,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/nb_NO/adblock.po b/applications/luci-app-adblock/po/nb_NO/adblock.po
index 7016f87117c44774a2ec47c0457f1e30ab81337a..a1006af6ef77a1f17917e41f5dc38a7caded8286 100644 (file)
--- a/applications/luci-app-adblock/po/nb_NO/adblock.po
+++ b/applications/luci-app-adblock/po/nb_NO/adblock.po
@@ -160,7 +160,7 @@ msgstr "Beskrivelse"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -203,24 +203,24 @@ msgstr "Nedlastingsverktøy (SSL-bibliotek)"
 msgid "E-Mail Notification"
 msgstr "E-postmerknad"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "E-postmottagersadresse"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "E-postmerknadsklient"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "E-postprofil"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "E-postmottagersadresse"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "E-postsenderadresse"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "E-postemne"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -272,7 +272,7 @@ msgid "Flush DNS Cache"
 msgstr "Tøm DNS-hurtiglageret"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "Tøm DNS-hurtiglageret etter behandling av reklameblokkering."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -305,7 +305,7 @@ msgstr "Ful sti til hvitlistingsfilen."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 "Hent inn DNS-relatert nettverkstrafikk gjennom tcpdump for å tilby en DNS-"
@@ -365,7 +365,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -425,18 +425,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -514,12 +514,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -644,7 +644,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -677,6 +677,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/pl/adblock.po b/applications/luci-app-adblock/po/pl/adblock.po
index 9f5f8b1baaa475f3549d3603705cac32084847e6..ef3e8c5d85541e5b010fa04a30945d3052607da7 100644 (file)
--- a/applications/luci-app-adblock/po/pl/adblock.po
+++ b/applications/luci-app-adblock/po/pl/adblock.po
@@ -163,7 +163,7 @@ msgstr "Opis"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 "Wyłącz ponowne uruchamiane adblocka i „Resetuj plik DNS” dla backendów DNS z "
@@ -208,24 +208,24 @@ msgstr "Narzędzie pobierania (SSL)"
 msgid "E-Mail Notification"
 msgstr "Powiadomienie E-Mail"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "Adres E-Mail odbiorcy"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "Licznik powiadomień E-Mail"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "Profil E-Mail"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "Adres E-Mail odbiorcy"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "Adres E-Mail nadawcy"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "Temat E-maila"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -279,7 +279,7 @@ msgid "Flush DNS Cache"
 msgstr "Opróżnij pamięć podręczną DNS"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "Opróżnij pamięć podręczną DNS po przetworzeniu blokady reklam."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -312,7 +312,7 @@ msgstr "Pełna ścieżka do pliku białej listy."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 "Zbierz ruch sieciowy związany z usługą DNS za pośrednictwem programu "
@@ -343,7 +343,8 @@ msgstr ""
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
 msgid ""
 "List of supported DNS backends with their default list export directory."
-msgstr "Lista obsługiwanych backendów DNS z domyślnym katalogiem eksportu list."
+msgstr ""
+"Lista obsługiwanych backendów DNS z domyślnym katalogiem eksportu list."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
 msgid ""
@@ -355,7 +356,8 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
 msgid "List of supported and fully pre-configured download utilities."
-msgstr "Lista obsługiwanych i wstępnie skonfigurowanych narzędzi do pobierania."
+msgstr ""
+"Lista obsługiwanych i wstępnie skonfigurowanych narzędzi do pobierania."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
@@ -376,7 +378,7 @@ msgid "Low Priority Service"
 msgstr "Usługa niskopriorytetowa"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 "Profil poczty używany przez 'msmtp' do wysyłania wiadomości e-mail z "
 "powiadomieniem."
@@ -443,20 +445,20 @@ msgstr "Domeny zapytań"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 "Podnieś minimalną liczbę powiadomień, aby otrzymywać e-maile, jeśli ogólna "
 "liczba jest mniejsza lub równa podanemu limitowi (domyślnie 0),"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr "Adres odbiorcy dla powiadomień E-Mailowych adblocka."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 "Przekieruj wszystkie zapytania DNS ze strefy 'lan' do lokalnego resolvera, "
 "dotyczy protokołu UDP i TCP na portach 53, 853 i 5353."
@@ -502,7 +504,8 @@ msgstr "Zgłoś liczbę fragmentów używanych przez tcpdump (domyślnie \"5\").
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
 msgid "Report chunk size used by tcpdump in MB (default '1')."
-msgstr "Zgłoś rozmiar fragmentu używanego przez tcpdump w MB (domyślnie \"1\")."
+msgstr ""
+"Zgłoś rozmiar fragmentu używanego przez tcpdump w MB (domyślnie \"1\")."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
 msgid ""
@@ -540,14 +543,14 @@ msgstr "Zapisz"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 "Wyślij e-mail z powiadomieniem w przypadku błędu przetwarzania lub gdy "
 "liczba domen to ≤ 0."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr "Adres nadawcy dla powiadomień E-Mailowych adblocka."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -563,8 +566,8 @@ msgid ""
 "Size of the download queue to handle downloads & list processing in "
 "parallel (default '4')."
 msgstr ""
-"Rozmiar kolejki pobierania do obsługi pobrań; równoległe przetwarzanie list ("
-"domyślnie '4')."
+"Rozmiar kolejki pobierania do obsługi pobrań; równoległe przetwarzanie list "
+"(domyślnie '4')."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
 msgid ""
@@ -620,7 +623,8 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
 msgid "Target directory for the generated blocklist 'adb_list.overall'."
-msgstr "Katalog docelowy dla wygenerowanej listy blokowania 'adb_list.overall'."
+msgstr ""
+"Katalog docelowy dla wygenerowanej listy blokowania 'adb_list.overall'."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:18
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:17
@@ -698,7 +702,7 @@ msgid "Top 10 Reporting"
 msgstr "Top 10 Raportów"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr "Temat dla powiadomień E-Mailowych adblocka."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -731,7 +735,7 @@ msgstr "Tak"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""
 "np. otrzymanie powiadomienień E-Mail z każdym uruchomieniem adblocka ustaw "

diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index c4e491dbfd02e4477904ed1b3e877c7bb4e42fcf..5c7f27a6fd459a037c37d282b04f8e58a66bee86 100644 (file)
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -166,7 +166,7 @@ msgstr "Descrição"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 "Desabilitar adblock disparado ao reiniciar e 'Zerar o Arquivo de DNS' para "
@@ -211,24 +211,24 @@ msgstr "Utilitário de Download (Biblioteca SSL)"
 msgid "E-Mail Notification"
 msgstr "Notificação por E-Mail"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "Endereço de E-Mail do Destinatário"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "Contagem de Notificações por E-Mail"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "Perfil de E-Mail"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "Endereço de E-Mail do Destinatário"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "Endereço de E-Mail do Remetente"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "Assunto do E-Mail"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -282,7 +282,7 @@ msgid "Flush DNS Cache"
 msgstr "Limpar a Cache do DNS"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "Limpar a Cache do DNS depois do processamento do adblock."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -315,7 +315,7 @@ msgstr "Caminho completo para o arquivo de Lista Branca."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 "Capturar o tráfego de rede relacionado com o DNS através do tcpdump para "
@@ -383,7 +383,7 @@ msgid "Low Priority Service"
 msgstr "Serviço de Baixa Prioridade"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 "Perfil de E-Mail usado no 'msmtp' para E-Mails de notificação do adblock."
 
@@ -450,14 +450,14 @@ msgstr "Consulta de domínios"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 "Elevar a contagem mínima de notificações para receber E-Mails caso a "
 "contagem geral for menor ou igual ao limite definido (a predefinição é 0),"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 "Endereço de E-Mail do destinatário para recebimento das notificações do "
 "adblock."
@@ -465,7 +465,7 @@ msgstr ""
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 "Redirecionar todas as consultas ao DNS vindas da zona 'lan' para o "
 "resolvedor local, aplicável às portas 53, 853 e 5353 dos protocolos udp e "
@@ -508,7 +508,8 @@ msgstr "Relatório de Porta(s) Auditadas"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
 msgid "Report chunk count used by tcpdump (default '5')."
-msgstr "Relatório da contagem dos pedaços usados pelo tcpdump (o padrão é '5')."
+msgstr ""
+"Relatório da contagem dos pedaços usados pelo tcpdump (o padrão é '5')."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
 msgid "Report chunk size used by tcpdump in MB (default '1')."
@@ -551,14 +552,14 @@ msgstr "Salvar"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 "Enviar notificações de E-Mail em caso de erro de processamento ou caso a "
 "contagem de domínios seja ≤ 0."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr "Endereço de E-Mail do remetente para notificações do adblock."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -587,7 +588,8 @@ msgstr ""
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
 msgid ""
 "Space separated list of reporting port(s) used by tcpdump (default: '53')."
-msgstr "Lista de portas usadas pelo tcpdump separadas por espaço (padrão '53')."
+msgstr ""
+"Lista de portas usadas pelo tcpdump separadas por espaço (padrão '53')."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:256
 msgid "Start Date"
@@ -704,7 +706,7 @@ msgid "Top 10 Reporting"
 msgstr "As 10 Principais Notificações"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr "Assunto da mensagem para as notificações de E-Mail do adblock."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -737,7 +739,7 @@ msgstr "Sim"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""
 "ex. para receber um E-Mail de notificação com cada rodada do adblock, defina "
@@ -789,7 +791,7 @@ msgstr ""
 
 #~ msgid ""
 #~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
-#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ "UDP and TCP protocol on port 53, 853 and 5353."
 #~ msgstr ""
 #~ "Redirecione todas as requisições DNS da zona 'LAN' para o servidor local. "
 #~ "Aplica-se aos protocolos UDP e TCP nas portas 53, 853 e 5353."

diff --git a/applications/luci-app-adblock/po/pt/adblock.po b/applications/luci-app-adblock/po/pt/adblock.po
index 71cea7ce680cb6235d08f9673871bf3dcff43b7d..9ce1712986a9bf33164ec9faa894ea868d3e35b8 100644 (file)
--- a/applications/luci-app-adblock/po/pt/adblock.po
+++ b/applications/luci-app-adblock/po/pt/adblock.po
@@ -163,7 +163,7 @@ msgstr "Descrição"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 "Desativar as reinicializações acionadas pelo adblock e o 'Repor o Ficheiro "
@@ -208,24 +208,24 @@ msgstr "Ferramenta para descarregar (Biblioteca SSL)"
 msgid "E-Mail Notification"
 msgstr "Notificação por e-mail"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "Endereço do destinatário de e-mail"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "Contagem de notificação de e-mail"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "Perfil de e-mail"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "Endereço do destinatário de e-mail"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "Endereço do remetente de e-mail"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "Tópico do e-mail"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -279,7 +279,7 @@ msgid "Flush DNS Cache"
 msgstr "Limpar o cache de DNS"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "Limpar o cache do DNS após o processamento pelo adblock."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -312,7 +312,7 @@ msgstr "Caminho completo para o ficheiro da lista de permissões."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 "Reúna o tráfego de rede relacionado a dns via tcpdump para fornecer um "
@@ -359,8 +359,8 @@ msgstr ""
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
 msgid "List of supported and fully pre-configured download utilities."
 msgstr ""
-"Lista de ferramentas de descarregamento suportadas e completamente "
-"pré-configuradas."
+"Lista de ferramentas de descarregamento suportadas e completamente pré-"
+"configuradas."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
@@ -381,7 +381,7 @@ msgid "Low Priority Service"
 msgstr "Serviço de Baixa Prioridade"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 "Perfil de e-mail usado em 'msmtp' para e-mails de notificação do adblock."
 
@@ -449,20 +449,20 @@ msgstr "Consultar domínios"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 "Aumente a contagem mínima de notificações, para obter e-mails se a contagem "
 "total for menor ou igual ao limite dado (predefinição 0),"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr "Endereço do destinatário para e-mails de notificação do adblock."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 "Redireccionar todas as consultas DNS da zona 'lan' para o resolvedor local, "
 "aplica-se ao protocolo udp e tcp nas portas 53, 853 e 5353."
@@ -547,14 +547,14 @@ msgstr "Guardar"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 "Enviar e-mails de notificação em caso de erro de processamento ou se a "
 "contagem de domínios for ≤ 0."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr "Endereço do remetente para e-mails de notificação adblock."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -628,7 +628,8 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
 msgid "Target directory for the generated blocklist 'adb_list.overall'."
-msgstr "Diretório de destino para a lista de blocos 'adb_list.overall' gerada ."
+msgstr ""
+"Diretório de destino para a lista de blocos 'adb_list.overall' gerada ."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:18
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:17
@@ -710,7 +711,7 @@ msgid "Top 10 Reporting"
 msgstr "Os 10 Relatórios Principais"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr "Tópico para e-mails de notificação adblock."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -743,7 +744,7 @@ msgstr "Sim"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""
 "por exemplo, para receber uma notificação por e-mail a cada execução "

diff --git a/applications/luci-app-adblock/po/ro/adblock.po b/applications/luci-app-adblock/po/ro/adblock.po
index 63902c77ed070758ecc3d3f7013dd35b5dc565cf..5bb8aaa915d70e410e92b9ba1ad1d0e0a574f380 100644 (file)
--- a/applications/luci-app-adblock/po/ro/adblock.po
+++ b/applications/luci-app-adblock/po/ro/adblock.po
@@ -155,7 +155,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -194,24 +194,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -261,7 +261,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -290,7 +290,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -348,7 +348,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -408,18 +408,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -497,12 +497,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -627,7 +627,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -660,6 +660,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po
index c9c79275bea18258259f109b36aa3f9f14408c58..c8ad04873440399043643438e38c417b6111f5f4 100644 (file)
--- a/applications/luci-app-adblock/po/ru/adblock.po
+++ b/applications/luci-app-adblock/po/ru/adblock.po
@@ -168,7 +168,7 @@ msgstr "Описание"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 "Отключить adblock запускаемые перезапуски и сброс файла DNS для бэкендов dns "
@@ -213,24 +213,24 @@ msgstr "Утилита для скачивания (с библиотекой SS
 msgid "E-Mail Notification"
 msgstr "Уведомление электронной почты"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "Адрес получателя электронной почты"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "Счётчик e-mail уведомлений"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "Профиль e-mail"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "Адрес получателя электронной почты"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "Адрес посланника электронной почты"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "Тема письма"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -283,7 +283,7 @@ msgid "Flush DNS Cache"
 msgstr "Очистка кэша DNS"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "Очистка DNS-кэша после обработки Adblock-ом."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -316,7 +316,7 @@ msgstr "Полный путь к файлу Белого списка."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 "Собирать DNS сетевой трафик через tcpdump для того, чтобы предоставить отчет "
@@ -383,7 +383,7 @@ msgid "Low Priority Service"
 msgstr "Низкий приоритет службы"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr "Профиль электронной почты, используемый в 'msmtp' для уведомлений."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -451,20 +451,21 @@ msgstr "Запрос доменов"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 "Увеличьте количество e-mail уведомлений, чтобы получить сообщения, если "
 "общее количество меньше или равно заданному пределу (по умолчанию 0),"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+#, fuzzy
+msgid "Receiver address for adblock notification e-mails."
 msgstr "Адрес получателя для уведомлений по электронной почте."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 "Перенаправить все DNS-запросы из зоны 'lan' в локальный преобразователь, "
 "используемый для протоколов udp и tcp на портах 53, 853 и 5353."
@@ -547,14 +548,14 @@ msgstr "Сохранить"
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 #, fuzzy
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 "Отправлять уведомления на почту в случае ошибки обработки или если число "
 "доменов ≤ 0."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr "Адрес отправителя для уведомлений по электронной почте."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -687,7 +688,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -720,7 +721,7 @@ msgstr "Да"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""
 

diff --git a/applications/luci-app-adblock/po/sk/adblock.po b/applications/luci-app-adblock/po/sk/adblock.po
index 292c440b66796cd7aa317861adc1b27b0fe8ec38..b8a224c28f902bdae16a632979f56bc472045ea4 100644 (file)
--- a/applications/luci-app-adblock/po/sk/adblock.po
+++ b/applications/luci-app-adblock/po/sk/adblock.po
@@ -148,7 +148,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -187,24 +187,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -254,7 +254,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -283,7 +283,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -341,7 +341,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -401,18 +401,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -490,12 +490,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -620,7 +620,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -653,6 +653,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index bc90f9e4a242811cef905f4167bc5d09ddc34efa..290865daad47e090f16dc5b8de742fa98d06c61f 100644 (file)
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -163,7 +163,7 @@ msgstr "Beskrivning"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 "Inaktivera adblock utlöst omstart och 'DNS-fil återställning' för DNS-"
@@ -208,24 +208,24 @@ msgstr "Nerladdningsprogram (SSL-bibliotek)"
 msgid "E-Mail Notification"
 msgstr "E-postavisering"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "E-postmottagaradress"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "Antal e-postaviseringar"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "E-postprofil"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "E-postmottagaradress"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "E-post avsändaradress"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "E-postämne"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -275,7 +275,7 @@ msgid "Flush DNS Cache"
 msgstr "Töm DNS-cache"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "Töm DNS-cachen efter adblock-bearbetning."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -308,7 +308,7 @@ msgstr "Full sökväg till vitliste-filen."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 "Samla DNS-relaterad nätverkstrafik via tcpdump för att tillhandahålla en DNS-"
@@ -373,7 +373,7 @@ msgid "Low Priority Service"
 msgstr "Lågprioriterad tjänst"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr "E-postprofil som används i 'msmtp' för adblock e-postaviseringar."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -437,18 +437,18 @@ msgstr "Fråga efter domäner"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -526,12 +526,12 @@ msgstr "Spara"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -658,7 +658,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -691,7 +691,7 @@ msgstr "Ja"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""
 

diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index 6f8466332c0e982b2fc3c68202d0545937ca573e..bc416993373298a59d0ef7c50b4f9c2646e554fb 100644 (file)
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -145,7 +145,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -184,24 +184,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -251,7 +251,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -280,7 +280,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -338,7 +338,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -398,18 +398,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -487,12 +487,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -617,7 +617,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -650,6 +650,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/tr/adblock.po b/applications/luci-app-adblock/po/tr/adblock.po
index 8e95b251630cb770cdc3bd949a0426e3806d0519..0d8ce064e4a6c21be9390683456f63c22cf8b772 100644 (file)
--- a/applications/luci-app-adblock/po/tr/adblock.po
+++ b/applications/luci-app-adblock/po/tr/adblock.po
@@ -15,9 +15,9 @@ msgid ""
 "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
 "than 64 MB free RAM, please only select a few of them!"
 msgstr ""
-"<b>Dikkat:</b> RAM alanı 64 MB'dan az olan, düşük bellekli cihazlarda OOM ("
-"yetersiz bellek) hatalarını önlemek için lütfen bunlardan yalnızca birkaçını "
-"seçin!"
+"<b>Dikkat:</b> RAM alanı 64 MB'dan az olan, düşük bellekli cihazlarda OOM "
+"(yetersiz bellek) hatalarını önlemek için lütfen bunlardan yalnızca "
+"birkaçını seçin!"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
@@ -164,7 +164,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -203,24 +203,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -270,7 +270,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -299,7 +299,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -357,7 +357,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -417,18 +417,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -506,12 +506,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is &le; 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -636,7 +636,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -669,6 +669,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/uk/adblock.po b/applications/luci-app-adblock/po/uk/adblock.po
index 925b12b00d03b42d082be29990a16c4568d7ad35..a017dfd1271d7e761b6152f016886fcd683e796d 100644 (file)
--- a/applications/luci-app-adblock/po/uk/adblock.po
+++ b/applications/luci-app-adblock/po/uk/adblock.po
@@ -155,7 +155,7 @@ msgstr "Опис"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 
@@ -194,24 +194,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -261,7 +261,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -290,7 +290,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -348,7 +348,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -408,18 +408,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -497,12 +497,12 @@ msgstr "Зберегти"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -627,7 +627,7 @@ msgid "Top 10 Reporting"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -660,6 +660,6 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""

diff --git a/applications/luci-app-adblock/po/vi/adblock.po b/applications/luci-app-adblock/po/vi/adblock.po
index da1be6cef3e57f90e9fdd5868c47dadfab88d725..b6a977331725aaf73cb018c4509a05cd56391856 100644 (file)
--- a/applications/luci-app-adblock/po/vi/adblock.po
+++ b/applications/luci-app-adblock/po/vi/adblock.po
@@ -91,8 +91,8 @@ msgid ""
 "Choose 'none' to disable automatic startups, 'timed' to use a classic "
 "timeout (default 30 sec.) or select another trigger interface."
 msgstr ""
-"Chọn \"none\" để tắt tự khởi động, \"timed\" để hẹn giờ (mặc địch là 30 giây)"
-" hoặc chọn giao diện khởi động khác."
+"Chọn \"none\" để tắt tự khởi động, \"timed\" để hẹn giờ (mặc địch là 30 "
+"giây) hoặc chọn giao diện khởi động khác."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
@@ -167,7 +167,7 @@ msgstr "Mô tả"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr "Ngừng tự khởi động chặn quảng cáo và tự động đặt lại tệp DNS."
 
@@ -206,24 +206,24 @@ msgstr ""
 msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-mail Profile"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -273,7 +273,7 @@ msgid "Flush DNS Cache"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -302,7 +302,7 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr ""
 
@@ -360,7 +360,7 @@ msgid "Low Priority Service"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -420,18 +420,18 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -509,12 +509,12 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -641,7 +641,7 @@ msgid "Top 10 Reporting"
 msgstr "10 báo cáo hàng đầu"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -675,7 +675,7 @@ msgstr "Có"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""
 "ví dụ: Để nhận email thông báo mỗi lần kích hoạt chặn quảng cáo, đặt giá trị "

diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index 20d13154cfbfaf7022b281071bafa965de2a6d52..015092b34cca05da57e7db722732a5e5f3e5870f 100644 (file)
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -163,7 +163,7 @@ msgstr "描述"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr ""
 "禁用 adblock 触发的重新启动以及具有自动加载功能的 dns 后端的“DNS 文件重置”。"
@@ -203,24 +203,24 @@ msgstr "下载实用程序（SSL 库）"
 msgid "E-Mail Notification"
 msgstr "E-Mail 通知"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "E-Mail 收件人地址"
+
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "E-Mail 通知计数"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "E-Mail 资料"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr "E-Mail 收件人地址"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "E-Mail 发件人地址"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "E-Mail 主题"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -270,7 +270,7 @@ msgid "Flush DNS Cache"
 msgstr "清空 DNS 缓存"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "在 adblock 进程启动后清空 DNS 缓存。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -299,7 +299,7 @@ msgstr "白名单文件的全路径。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr "通过 tcpdump 收集 dns 有关的网络流量，以按需提供 DNS 查询报告。"
 
@@ -358,7 +358,7 @@ msgid "Low Priority Service"
 msgstr "低优先级服务"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr "adblock 发送通知邮件用的“msmtp”账户名。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -420,19 +420,19 @@ msgstr "查询域"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 "如果总计数小于或等于给定的限制（默认为0），则提高最小通知计数以获取 E-Mail，"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr "adblock 通知 E-Mail 的收件人地址。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 "将所有 DNS 查询从“lan”区域重定向到本地解析器，包括 udp、tcp 协议的 53、853、"
 "5353 端口 。"
@@ -512,12 +512,12 @@ msgstr "保存"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr "如果发生处理错误或域名数 ≤ 0，则发送通知 E-Mail。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr "adblock 通知 E-Mail 的发件人地址。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -643,7 +643,7 @@ msgid "Top 10 Reporting"
 msgstr "前十报告"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr "adblock 通知 E-Mail 的主题。"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -676,7 +676,7 @@ msgstr "是"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr "例如：要在每次运行 adblock 时收到 E-Mail 通知，请将此值设置为 200000。"
 
@@ -724,7 +724,7 @@ msgstr "例如：要在每次运行 adblock 时收到 E-Mail 通知，请将此
 
 #~ msgid ""
 #~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
-#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ "UDP and TCP protocol on port 53, 853 and 5353."
 #~ msgstr ""
 #~ "将所有 DNS 查询从“lan”区域重定向到本地解析器，适用于端口53、853和5353上的 "
 #~ "udp 和 tcp 协议。"

diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po
index 2b401e872682a7f8bdf8aff815b27be1fac1420e..15d49df9018fcc5d832c28cb2c03f8ac65ddf06c 100644 (file)
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@ -162,7 +162,7 @@ msgstr "說明"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
 msgstr "禁用廣告板觸發重新開機和\"DNS 檔重置\"的 DNS 後端與自動載入功能。"
 
@@ -202,23 +202,23 @@ msgid "E-Mail Notification"
 msgstr "電子郵件通知"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
-msgid "E-Mail Notification Count"
+msgid "E-mail Notification Count"
 msgstr "電子郵件通知計數"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
-msgid "E-Mail Profile"
+msgid "E-mail Profile"
 msgstr "電子郵件設定檔"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
+msgid "E-mail Receiver Address"
 msgstr "電子郵件接收方位址"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
-msgid "E-Mail Sender Address"
+msgid "E-mail Sender Address"
 msgstr "電子郵件寄件者位址"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
-msgid "E-Mail Topic"
+msgid "E-mail Topic"
 msgstr "電子郵件主題"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
@@ -268,7 +268,7 @@ msgid "Flush DNS Cache"
 msgstr "清空 DNS 快取"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
-msgid "Flush DNS Cache after adblock processing."
+msgid "Flush DNS cache after adblock processing."
 msgstr "在 adblock 程序啟動後清空 DNS 快取。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
@@ -297,7 +297,7 @@ msgstr "白名單檔案的全路徑。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
 msgid ""
-"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"Gather DNS related network traffic via tcpdump to provide a DNS Query Report "
 "on demand."
 msgstr "通過 tcpdump 收集 dns 有關的網路流量，以按需提供 DNS 查詢報告。"
 
@@ -355,7 +355,7 @@ msgid "Low Priority Service"
 msgstr "低優先順序服務"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
-msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgid "Mail profile used in 'msmtp' for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
@@ -417,18 +417,18 @@ msgstr "查詢域"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum notification count, to get E-Mails if the overall count is "
+"Raise the minimum notification count, to get e-mails if the overall count is "
 "less or equal to the given limit (default 0),"
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
-msgid "Receiver address for adblock notification E-Mails."
+msgid "Receiver address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
 msgid ""
 "Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
-"udp and tcp protocol on ports 53, 853 and 5353."
+"UDP and TCP protocol on port 53, 853 and 5353."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
@@ -506,12 +506,12 @@ msgstr "儲存"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification E-Mails in case of a processing error or if domain count "
+"Send notification e-mails in case of a processing error or if domain count "
 "is ≤ 0."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
-msgid "Sender address for adblock notification E-Mails."
+msgid "Sender address for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
@@ -637,7 +637,7 @@ msgid "Top 10 Reporting"
 msgstr "前十報告"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
-msgid "Topic for adblock notification E-Mails."
+msgid "Topic for adblock notification e-mails."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
@@ -670,7 +670,7 @@ msgstr "是"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an E-Mail notification with every adblock run set this value "
+"e.g. to receive an e-mail notification with every adblock run set this value "
 "to 200000."
 msgstr ""
 
@@ -718,7 +718,7 @@ msgstr ""
 
 #~ msgid ""
 #~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
-#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ "UDP and TCP protocol on port 53, 853 and 5353."
 #~ msgstr ""
 #~ "將所有 DNS 查詢從“lan”區域重定向到本地解析器，適用於埠53、853和5353上的 "
 #~ "udp 和 tcp 協議。"

diff --git a/applications/luci-app-adblock/root/etc/uci-defaults/40_luci-adblock b/applications/luci-app-adblock/root/etc/uci-defaults/40_luci-adblock
index 1f7fb1c0fbb92f3dcaaeefc5219b743438912124..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100755 (executable)
--- a/applications/luci-app-adblock/root/etc/uci-defaults/40_luci-adblock
+++ b/applications/luci-app-adblock/root/etc/uci-defaults/40_luci-adblock
@@ -1,11 +1,4 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@adblock[-1]
-       add ucitrack adblock
-       set ucitrack.@adblock[-1].init=adblock
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-advanced-reboot/Makefile b/applications/luci-app-advanced-reboot/Makefile
index 97301fc6afe4fbba32d7b374062083089e0840f3..20f91689365105cfd8f950bfdc83431bf8b976fa 100644 (file)
--- a/applications/luci-app-advanced-reboot/Makefile
+++ b/applications/luci-app-advanced-reboot/Makefile
@@ -13,7 +13,7 @@ LUCI_DESCRIPTION:=Provides Web UI (found under System/Advanced Reboot) to reboot
 
 LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full
 LUCI_PKGARCH:=all
-PKG_RELEASE:=46
+PKG_RELEASE:=47
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
index 6ed4c6614931536cb5ce14f463732934b2ee4911..3da7bbe0f21b29d0f9a86b5eac2cc70f4d0f7cd1 100644 (file)
--- a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
+++ b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
@@ -34,7 +34,7 @@ function is_alt_mountable(p1_mtd, p2_mtd)
 end
 
 function get_partition_os_info(op_ubi)
-       local cp_info, ap_info
+       local cp_info, op_info
        if fs.access("/etc/os-release") then
                cp_info = util.trim(util.exec('. /etc/os-release && echo "$PRETTY_NAME"'))
                if cp_info:find("SNAPSHOT") then
@@ -45,14 +45,14 @@ function get_partition_os_info(op_ubi)
        alt_partition_unmount(op_ubi)
        alt_partition_mount(op_ubi)
        if fs.access("/alt/rom/etc/os-release") then
-               ap_info = util.trim(util.exec('. /alt/rom/etc/os-release && echo "$PRETTY_NAME"'))
-               if ap_info:find("SNAPSHOT") then
-                       ap_info = util.trim(util.exec('. /alt/rom/etc/os-release && echo "$OPENWRT_RELEASE"'))
+               op_info = util.trim(util.exec('. /alt/rom/etc/os-release && echo "$PRETTY_NAME"'))
+               if op_info:find("SNAPSHOT") then
+                       op_info = util.trim(util.exec('. /alt/rom/etc/os-release && echo "$OPENWRT_RELEASE"'))
                end 
        end
        logger(i18n.translate("attempting to unmount alternative partition") .. " (mtd" .. tostring(op_ubi) .. ")")
        alt_partition_unmount(op_ubi)
-       return cp_info, ap_info
+       return cp_info, op_info
 end
 
 function alt_partition_mount(op_ubi)
@@ -87,107 +87,124 @@ function alt_partition_unmount(op_ubi)
        end
 end
 
-devices = {
-       -- deviceName, boardName, part1MTD, part2MTD, offset, envVar1, envVar1Value1, envVar1Value2, envVar2, envVar2Value1, envVar2Value2
-       {"Linksys EA3500", "linksys-audi", "mtd3", "mtd5", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
-       {"Linksys E4200v2/EA4500", "linksys-viper", "mtd3", "mtd5", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
-       {"Linksys EA6350v3", "linksys-ea6350v3", "mtd10", "mtd12", 192, "boot_part", 1, 2},
-       {"Linksys EA8300", "linksys-ea8300", "mtd10", "mtd12", 192, "boot_part", 1, 2},
-       {"Linksys EA8500", "ea8500", "mtd13", "mtd15", 32, "boot_part", 1, 2},
---  {"Linksys EA9500", "linksys-panamera", "mtd3", "mtd6", 28, "boot_part", 1, 2},
-       {"Linksys WRT1200AC", "linksys-caiman", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
-       {"Linksys WRT1900AC", "linksys-mamba", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
-       {"Linksys WRT1900ACv2", "linksys-cobra", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
-       {"Linksys WRT1900ACS", "linksys-shelby", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
-       {"Linksys WRT3200ACM", "linksys-rango", "mtd5", "mtd7", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
-       {"Linksys WRT32X", "linksys-venom", "mtd5", "mtd7", nil, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
-       {"ZyXEL NBG6817", "nbg6817", "mmcblk0p4", "mmcblk0p7", 32, nil, 255, 1}
-}
-
--- local errorMessage, d
--- local device_name, p1_mtd, p2_mtd, offset, bev1, bev1p1, bev1p2, bev2, bev2p1, bev2p2
-romBoardName = util.trim(util.exec("cat /tmp/sysinfo/board_name"))
-
-for i=1, #devices do
-       d = devices[i][2]:gsub('%p','')
-       if romBoardName and romBoardName:gsub('%p',''):match(d) then
-               device_name = devices[i][1]
-               p1_mtd = devices[i][3] or nil
-               p2_mtd = devices[i][4] or nil
-               offset = devices[i][5] or nil
-               bev1 = devices[i][6] or nil
-               bev1p1 = tonumber(devices[i][7]) or nil
-               bev1p2 = tonumber(devices[i][8]) or nil
-               bev2 = devices[i][9] or nil
-               bev2p1 = devices[i][10] or nil
-               bev2p2 = devices[i][11] or nil
-               if p1_mtd and offset then
-                       p1_label = util.trim(util.exec("dd if=/dev/" .. p1_mtd .. " bs=1 skip=" .. offset .. " count=128" .. "  2>/dev/null"))
-                       n, p1_version = p1_label:match('(Linux)-([%d|.]+)')
-               end
-               if p2_mtd and offset then
-                       p2_label = util.trim(util.exec("dd if=/dev/" .. p2_mtd .. " bs=1 skip=" .. offset .. " count=128" .. "  2>/dev/null"))
-                       n, p2_version = p2_label:match('(Linux)-([%d|.]+)')
-               end
-               if p1_label and p1_label:find("LEDE") then p1_os = "LEDE" end
-               if p1_label and p1_label:find("OpenWrt") then p1_os = "OpenWrt" end
-               if p1_label and p1_label:find("Linksys") then p1_os = "Linksys" end
-               if p2_label and p2_label:find("LEDE") then p2_os = "LEDE" end
-               if p2_label and p2_label:find("OpenWrt") then p2_os = "OpenWrt" end
-               if p2_label and p2_label:find("Linksys") then p2_os = "Linksys" end
-               if device_name == "ZyXEL NBG6817" then
-                       if not p1_os then p1_os = "ZyXEL" end
-                       if not p2_os then p2_os = "ZyXEL" end
-               end
-               if device_name == "Linksys WRT32X" then
-                       if not p1_os then p1_os = "Unknown/Compressed" end
-                       if not p2_os then p2_os = "Unknown/Compressed" end
-               end
-               if not p1_os then p1_os = "Unknown" end
-               if not p2_os then p2_os = "Unknown" end
-               if p1_os and p1_version then p1_os = p1_os .. " (Linux " .. p1_version .. ")" end
-               if p2_os and p2_version then p2_os = p2_os .. " (Linux " .. p2_version .. ")" end
-
-               if device_name == "ZyXEL NBG6817" then
-                       if not zyxelFlagPartition then zyxelFlagPartition = util.trim(util.exec(". /lib/functions.sh; find_mtd_part 0:DUAL_FLAG")) end
-                       if not zyxelFlagPartition then
-                               errorMessage = errorMessage or "" .. i18n.translate("Unable to find Dual Boot Flag Partition." .. " ")
-                               util.perror(i18n.translate("Unable to find Dual Boot Flag Partition."))
-                       else
-                               current_partition = tonumber(util.exec("dd if=" .. zyxelFlagPartition .. " bs=1 count=1 2>/dev/null | hexdump -n 1 -e '1/1 \"%d\"'"))
+function obtain_device_info()
+       local i, d, p1_mtd, p2_mtd, offset, bev1, bev1p1, bev1p2, bev2, bev2p1, n
+       local p1_label, p1_version, p2_label, p2_version, p1_os, p2_os
+       local errorMessage, current_partition, other_partition
+       local op_ubi, cp_info, op_info
+       local zyxelFlagPartition
+       local devices = {
+               -- deviceName, boardName, part1MTD, part2MTD, offset, envVar1, envVar1Value1, envVar1Value2, envVar2, envVar2Value1, envVar2Value2
+               {"Linksys EA3500", "linksys-audi", "mtd3", "mtd5", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
+               {"Linksys E4200v2/EA4500", "linksys-viper", "mtd3", "mtd5", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
+               {"Linksys EA6350v3", "linksys-ea6350v3", "mtd10", "mtd12", 192, "boot_part", 1, 2},
+               {"Linksys EA8300", "linksys-ea8300", "mtd10", "mtd12", 192, "boot_part", 1, 2},
+               {"Linksys EA8500", "ea8500", "mtd13", "mtd15", 32, "boot_part", 1, 2},
+       --  {"Linksys EA9500", "linksys-panamera", "mtd3", "mtd6", 28, "boot_part", 1, 2},
+               {"Linksys WRT1200AC", "linksys-caiman", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
+               {"Linksys WRT1900AC", "linksys-mamba", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
+               {"Linksys WRT1900ACv2", "linksys-cobra", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
+               {"Linksys WRT1900ACS", "linksys-shelby", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
+               {"Linksys WRT3200ACM", "linksys-rango", "mtd5", "mtd7", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
+               {"Linksys WRT32X", "linksys-venom", "mtd5", "mtd7", nil, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
+               {"ZyXEL NBG6817", "nbg6817", "mmcblk0p4", "mmcblk0p7", 32, nil, 255, 1}
+       }
+       local romBoardName = util.trim(util.exec("cat /tmp/sysinfo/board_name"))
+       for i=1, #devices do
+               d = devices[i][2]:gsub('%p','')
+               if romBoardName and romBoardName:gsub('%p',''):match(d) then
+                       device_name = devices[i][1]
+                       p1_mtd = devices[i][3] or nil
+                       p2_mtd = devices[i][4] or nil
+                       offset = devices[i][5] or nil
+                       bev1 = devices[i][6] or nil
+                       bev1p1 = tonumber(devices[i][7]) or nil
+                       bev1p2 = tonumber(devices[i][8]) or nil
+                       bev2 = devices[i][9] or nil
+                       bev2p1 = devices[i][10] or nil
+                       bev2p2 = devices[i][11] or nil
+                       if p1_mtd and offset then
+                               p1_label = util.trim(util.exec("dd if=/dev/" .. p1_mtd .. " bs=1 skip=" .. offset .. " count=128" .. "  2>/dev/null"))
+                               n, p1_version = p1_label:match('(Linux)-([%d|.]+)')
                        end
-               else
-                       if fs.access("/usr/sbin/fw_printenv") and fs.access("/usr/sbin/fw_setenv") then
-                               current_partition = tonumber(util.trim(util.exec("fw_printenv -n " .. bev1)))
+                       if p2_mtd and offset then
+                               p2_label = util.trim(util.exec("dd if=/dev/" .. p2_mtd .. " bs=1 skip=" .. offset .. " count=128" .. "  2>/dev/null"))
+                               n, p2_version = p2_label:match('(Linux)-([%d|.]+)')
                        end
-               end
-               other_partition = current_partition == bev1p2 and bev1p1 or bev1p2
-               
-               if is_alt_mountable(p1_mtd, p2_mtd) then
-                       if current_partition == bev1p1 then
-                               op_ubi = tonumber(p2_mtd:sub(4)) + 1
-                       else
-                               op_ubi = tonumber(p1_mtd:sub(4)) + 1
+                       if p1_label and p1_label:find("LEDE") then p1_os = "LEDE" end
+                       if p1_label and p1_label:find("OpenWrt") then p1_os = "OpenWrt" end
+                       if p1_label and p1_label:find("Linksys") then p1_os = "Linksys" end
+                       if p2_label and p2_label:find("LEDE") then p2_os = "LEDE" end
+                       if p2_label and p2_label:find("OpenWrt") then p2_os = "OpenWrt" end
+                       if p2_label and p2_label:find("Linksys") then p2_os = "Linksys" end
+                       if device_name == "ZyXEL NBG6817" then
+                               if not p1_os then p1_os = "ZyXEL" end
+                               if not p2_os then p2_os = "ZyXEL" end
+                       end
+                       if device_name == "Linksys WRT32X" then
+                               if not p1_os then p1_os = "Unknown/Compressed" end
+                               if not p2_os then p2_os = "Unknown/Compressed" end
                        end
-                       local cp_info, ap_info = get_partition_os_info(op_ubi)
-                       if current_partition == bev1p1 then
-                               p1_os = cp_info or p1_os
-                               p2_os = ap_info or p2_os
+                       if not p1_os then p1_os = "Unknown" end
+                       if not p2_os then p2_os = "Unknown" end
+                       if p1_os and p1_version then p1_os = p1_os .. " (Linux " .. p1_version .. ")" end
+                       if p2_os and p2_version then p2_os = p2_os .. " (Linux " .. p2_version .. ")" end
+                       
+                       if device_name == "ZyXEL NBG6817" then
+                               if not zyxelFlagPartition then zyxelFlagPartition = util.trim(util.exec(". /lib/functions.sh; find_mtd_part 0:DUAL_FLAG")) end
+                               if not zyxelFlagPartition then
+                                       errorMessage = errorMessage or "" .. i18n.translate("Unable to find Dual Boot Flag Partition." .. " ")
+                                       util.perror(i18n.translate("Unable to find Dual Boot Flag Partition."))
+                               else
+                                       current_partition = tonumber(util.exec("dd if=" .. zyxelFlagPartition .. " bs=1 count=1 2>/dev/null | hexdump -n 1 -e '1/1 \"%d\"'"))
+                               end
                        else
-                               p1_os = ap_info or p1_os
-                               p2_os = cp_info or p2_os
+                               if fs.access("/usr/sbin/fw_printenv") and fs.access("/usr/sbin/fw_setenv") then
+                                       current_partition = tonumber(util.trim(util.exec("fw_printenv -n " .. bev1)))
+                               end
+                       end
+                       other_partition = current_partition == bev1p2 and bev1p1 or bev1p2
+                       
+                       if is_alt_mountable(p1_mtd, p2_mtd) then
+                               if current_partition == bev1p1 then
+                                       op_ubi = tonumber(p2_mtd:sub(4)) + 1
+                               else
+                                       op_ubi = tonumber(p1_mtd:sub(4)) + 1
+                               end
+                               local cp_info, op_info = get_partition_os_info(op_ubi)
+                               if current_partition == bev1p1 then
+                                       p1_os = cp_info or p1_os
+                                       p2_os = op_info or p2_os
+                               else
+                                       p1_os = op_info or p1_os
+                                       p2_os = cp_info or p2_os
+                               end
                        end
                end
        end
+       return romBoardName, device_name, bev1, bev1p1, p1_os, bev1p2, p2_os, bev2, bev2p1, bev2p2, current_partition
 end
 
 function index()
-       entry({"admin", "system", "advanced_reboot"}, template("advanced_reboot/advanced_reboot"), _("Advanced Reboot"), 90)
+       entry({"admin", "system", "advanced_reboot"}, call("action_template"), _("Advanced Reboot"), 90)
        entry({"admin", "system", "advanced_reboot", "reboot"}, post("action_reboot"))
        entry({"admin", "system", "advanced_reboot", "alternative_reboot"}, post("action_altreboot"))
        entry({"admin", "system", "advanced_reboot", "power_off"}, post("action_poweroff"))
 end
 
+function action_template()
+       local romBoardName, device_name, bev1, bev1p1, p1_os, bev1p2, p2_os, bev2, bev2p1, bev2p2, current_partition = obtain_device_info()
+       ltemplate.render("advanced_reboot/advanced_reboot",{
+                               romBoardName=romBoardName,
+                               device_name=device_name,
+                               bev1p1=bev1p1,
+                               p1_os=p1_os,
+                               bev1p2=bev1p2,
+                               p2_os=p2_os,
+                               current_partition=current_partition,
+                               errorMessage = errorMessage})
+end
+
 function action_reboot()
        ltemplate.render("advanced_reboot/applyreboot", {
                                title = i18n.translate("Rebooting..."),
@@ -198,6 +215,7 @@ function action_reboot()
 end
 
 function action_altreboot()
+       local romBoardName, device_name, bev1, bev1p1, p1_os, bev1p2, p2_os, bev2, bev2p1, bev2p2, current_partition = obtain_device_info()
        local zyxelFlagPartition, zyxelBootFlag, zyxelNewBootFlag, errorCode, curEnvSetting, newEnvSetting
        errorMessage = nil
        errorCode = 0

diff --git a/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua b/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua
index 17fdc566ce1342e6abe27759b220818c81a6cf46..88068c13657f0765e235d1c49853f76f98c7828b 100644 (file)
--- a/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua
+++ b/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua
@@ -67,7 +67,7 @@ for user in util.execi("cat /etc/passwd | cut -d':' -f1") do
 end
 
 o = s:taboption("basic", Value, "dir", translate("Download directory"),
-       translate("The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"))
+       translate("The directory to store the downloaded file. For example <code>/mnt/sda1</code>."))
 o.rmempty = false
 
 o = s:taboption("basic", Value, "config_dir", translate("Config file directory"),
@@ -239,7 +239,7 @@ o.placeholder = "60"
 
 o = s:taboption("http", Value, "lowest_speed_limit", translate("Lowest speed limit"),
        "%s %s" % {
-               translate("Close connection if download speed is lower than or equal to this value(bytes per sec). " ..
+               translate("Close connection if download speed is lower than or equal to this value (bytes per sec). " ..
        "0 means has no lowest speed limit."),
                translate("You can append K or M.")
        })
@@ -312,7 +312,7 @@ if aria2.bt then
        o.default = "true"
        o.rmempty = false
 
-       o = s:taboption("bt", Flag, "bt_save_metadata", translate("Sava metadata"),
+       o = s:taboption("bt", Flag, "bt_save_metadata", translate("Save metadata"),
                translate("Save meta data as \".torrent\" file. This option has effect only when BitTorrent"
                .. " Magnet URI is used. The file name is hex encoded info hash with suffix \".torrent\"."))
        o.enabled = "true"
@@ -339,7 +339,7 @@ if aria2.bt then
        o.placeholder = "6881-6999"
 
        o = s:taboption("bt", Value, "dht_listen_port", translate("DHT Listen port"),
-               translate("Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure that the "
+               translate("Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure that the "
                .. "specified ports are open for incoming UDP traffic."))
        o:depends("enable_dht", "true")
        o:depends("enable_dht6", "true")
@@ -426,7 +426,7 @@ o.disabled = "false"
 o.default = "false"
 
 o = s:taboption("advance", Value, "auto_save_interval", translate("Auto save interval"),
-       translate("Save a control file(*.aria2) every N seconds. If 0 is given, a control file is not"
+       translate("Save a control file (*.aria2) every N seconds. If 0 is given, a control file is not"
        .. " saved during download."))
 o.datatype = "range(0, 600)"
 o.placeholder = "60"
@@ -446,7 +446,7 @@ o.placeholder = "16M"
 
 o = s:taboption("advance", ListValue, "file_allocation", translate("File allocation"),
        translate("Specify file allocation method. If you are using newer file systems such as ext4"
-       .. " (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc\" is your best choice."
+       .. " (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc\" is your best choice."
        .. " It allocates large(few GiB) files almost instantly, but it may not be available if your system"
        .. " doesn't have posix_fallocate(3) function. Don't use \"falloc\" with legacy file systems such as"
        .. " ext3 and FAT32 because it takes almost same time as \"prealloc\" and it blocks aria2 entirely"

diff --git a/applications/luci-app-aria2/po/bg/aria2.po b/applications/luci-app-aria2/po/bg/aria2.po
index 0a2b19158e2eac85ed361ee3a8f4d2f1c4683f01..be9d43547657d934932f56f4264928df62be34c1 100644 (file)
--- a/applications/luci-app-aria2/po/bg/aria2.po
+++ b/applications/luci-app-aria2/po/bg/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,13 +485,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -559,7 +559,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -615,7 +615,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/ca/aria2.po b/applications/luci-app-aria2/po/ca/aria2.po
index 64ae2c6c6fb23d793b025cf04bfbebe968ef8fed..c0e29637262de0796f1b71441faf17f3eda69d13 100644 (file)
--- a/applications/luci-app-aria2/po/ca/aria2.po
+++ b/applications/luci-app-aria2/po/ca/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,13 +491,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -621,7 +621,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/cs/aria2.po b/applications/luci-app-aria2/po/cs/aria2.po
index 7740460b6000df0ba35512c9cd176e634a469dcc..b60c8d7a93b1dc7229e59205c074191499c7a938 100644 (file)
--- a/applications/luci-app-aria2/po/cs/aria2.po
+++ b/applications/luci-app-aria2/po/cs/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,13 +491,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr "Spustit démona pod uživatelskými oprávněními"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -621,7 +621,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/de/aria2.po b/applications/luci-app-aria2/po/de/aria2.po
index 21d34a88b311707f0fe44b17dabefb27db3d2aee..9f2154eabfe45f49bf0ad31b696796d0f806e5f4 100644 (file)
--- a/applications/luci-app-aria2/po/de/aria2.po
+++ b/applications/luci-app-aria2/po/de/aria2.po
@@ -75,8 +75,8 @@ msgstr "Zertifikat überprüfen"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Schließe die Verbindung wenn die Download-Geschwinidigkeit niedriger oder "
 "gleich dieses Wertes (Bytes pro Sekunde) ist. 0 heißt es gibt keine "
@@ -517,13 +517,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr "Daemon als Benutzer ausführen"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr "Speichere Metadaten"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -547,6 +543,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Speichere Metadaten"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -591,7 +591,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -647,7 +647,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -710,7 +710,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/el/aria2.po b/applications/luci-app-aria2/po/el/aria2.po
index 3385eccd7a2b8961a7cdf16ec9fdc6720299b470..0e6b984c9cbfcd029c22c20b91f78b554a53c24b 100644 (file)
--- a/applications/luci-app-aria2/po/el/aria2.po
+++ b/applications/luci-app-aria2/po/el/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,13 +491,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -621,7 +621,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/en/aria2.po b/applications/luci-app-aria2/po/en/aria2.po
index 3cbedbb7572164f5cb164e7daf97056a9178a551..0d5050cc02738a229e1262125cd426e8d2ffeef8 100644 (file)
--- a/applications/luci-app-aria2/po/en/aria2.po
+++ b/applications/luci-app-aria2/po/en/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,13 +485,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -559,7 +559,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -615,7 +615,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/es/aria2.po b/applications/luci-app-aria2/po/es/aria2.po
index ecae3ade7a7da97902cce0fb1ad381ba8e91fd09..b4e495beba0c5685c763850a91b01ed1de0b282b 100644 (file)
--- a/applications/luci-app-aria2/po/es/aria2.po
+++ b/applications/luci-app-aria2/po/es/aria2.po
@@ -77,8 +77,8 @@ msgstr "Comprobar certificado"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Cierre la conexión si la velocidad de descarga es menor o igual a este valor "
 "(bytes por segundo). 0 significa que no tiene límite de velocidad mínima."
@@ -513,13 +513,9 @@ msgstr "Espera de reintento"
 msgid "Run daemon as user"
 msgstr "Ejecutar demonio como usuario"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr "Guardar metadatos"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 "Guarda un archivo de control (*.aria2) cada N segundos. Si se da 0, no se "
@@ -554,6 +550,10 @@ msgstr ""
 "efecto cuando se utiliza la URI de BitTorrent Magnet. El nombre del archivo "
 "es hash de información codificado hexadecimal con sufijo \".torrent\"."
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Guardar metadatos"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Guardar intervalo de sesión"
@@ -582,8 +582,8 @@ msgid ""
 "<code>Content-Encoding: deflate</code>."
 msgstr ""
 "Enviar <code>Aceptar: deflate, gzip</code> encabezado de solicitud e inflar "
-"respuesta si el servidor remoto responde con <code>Content-Encoding: "
-"gzip</code> o <code>Content-Encoding: deflate</code>."
+"respuesta si el servidor remoto responde con <code>Content-Encoding: gzip</"
+"code> o <code>Content-Encoding: deflate</code>."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
 msgid ""
@@ -609,7 +609,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 "Configure el puerto de escucha UDP utilizado por DHT (IPv4, IPv6) y el "
@@ -681,7 +681,7 @@ msgstr "Mostrar URL"
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -711,8 +711,8 @@ msgid ""
 "with this option, seeding ends when at least one of the conditions is "
 "satisfied. Specifying 0 disables seeding after download completed."
 msgstr ""
-"Especifique el tiempo de sembrado en minutos. Si se especifica la opción \""
-"Proporción de sembrado\" junto con esta opción, la siembra finaliza cuando "
+"Especifique el tiempo de sembrado en minutos. Si se especifica la opción "
+"\"Proporción de sembrado\" junto con esta opción, la siembra finaliza cuando "
 "se cumple al menos una de las condiciones. Especificar 0 desactiva el "
 "sembrado después de completar la descarga."
 
@@ -771,7 +771,9 @@ msgstr ""
 "y el archivo DHT."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 "El directorio para almacenar el archivo descargado. p.ej. <code>/mnt/sda1</"
 "code>"

diff --git a/applications/luci-app-aria2/po/fr/aria2.po b/applications/luci-app-aria2/po/fr/aria2.po
index e3fef7aa5b86e1cb781e074e6dcf3bbde2fddbcb..c4bfef077e1540bf6133744a80d21372480f063c 100644 (file)
--- a/applications/luci-app-aria2/po/fr/aria2.po
+++ b/applications/luci-app-aria2/po/fr/aria2.po
@@ -75,8 +75,8 @@ msgstr "Vérifier le certificat"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Ferme la connexion si la vitesse de téléchargement est inférieure ou égale à "
 "cette valeur (en bits par seconde). 0 signifie qu'il n'y a pas de limite de "
@@ -312,8 +312,8 @@ msgid ""
 "List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
 "netrc</code>."
 msgstr ""
-"Liste des paramètres supplémentaires. Format : option=valeur, par ex. <code"
-">netrc-path=/tmp/.netrc</code>."
+"Liste des paramètres supplémentaires. Format : option=valeur, par ex. "
+"<code>netrc-path=/tmp/.netrc</code>."
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
 msgid "Loading"
@@ -508,13 +508,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr "Enregistrer les métadonnées"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 "Enregistre un fichier de contrôle (*.aria2) toutes les N secondes. Si défini "
@@ -540,6 +536,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Enregistrer les métadonnées"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Intervalle d'enregistrement de la session"
@@ -584,7 +584,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -652,7 +652,7 @@ msgstr "Afficher l'URL"
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -724,7 +724,9 @@ msgstr ""
 "session et le fichier DHT."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 "Répertoire dans lequel télécharger le fichier télécharger. Par ex. <code>/"
 "mnt/sda1</code>"

diff --git a/applications/luci-app-aria2/po/he/aria2.po b/applications/luci-app-aria2/po/he/aria2.po
index c615f2efab7fdd571239b8b20fec3113e9590794..0bc0627723d7889ccfdb46217bdc5f5fb233660d 100644 (file)
--- a/applications/luci-app-aria2/po/he/aria2.po
+++ b/applications/luci-app-aria2/po/he/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,13 +485,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -559,7 +559,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -615,7 +615,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/hi/aria2.po b/applications/luci-app-aria2/po/hi/aria2.po
index 3a9a7d2f5b61fd818644faf9481de971d2339dff..26c10afa4df9ccc9c5c14bd8f071e16794e7aff8 100644 (file)
--- a/applications/luci-app-aria2/po/hi/aria2.po
+++ b/applications/luci-app-aria2/po/hi/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,13 +485,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -559,7 +559,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -615,7 +615,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/hu/aria2.po b/applications/luci-app-aria2/po/hu/aria2.po
index 3d94cb417d1b468ecc9580ab347eb3068377ec95..95599efe781bcda28cea9cd09505496a59067b99 100644 (file)
--- a/applications/luci-app-aria2/po/hu/aria2.po
+++ b/applications/luci-app-aria2/po/hu/aria2.po
@@ -75,8 +75,8 @@ msgstr "Tanúsítvány ellenőrzése"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Kapcsolat lezárása, ha a letöltési sebesség kisebb vagy egyenlő ezzel az "
 "értékkel (bájt/másodperc). A 0 azt jelenti, hogy nincs legalacsonyabb "
@@ -519,13 +519,9 @@ msgstr "Újrapróbálás várakozása"
 msgid "Run daemon as user"
 msgstr "Démon futtatása felhasználóként"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr "Metaadatok mentése"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 "Vezérlőfájl (*.aria2) mentése N másodpercenként. Ha 0 van megadva, akkor a "
@@ -561,6 +557,10 @@ msgstr ""
 "hatása, ha BitTorrent mágnes URI-t használnak. A fájlnév hexadecimálisan "
 "kódolt információs kivonat „.torrent” utótaggal."
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Metaadatok mentése"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Munkamenet mentési időköze"
@@ -602,8 +602,8 @@ msgid ""
 msgstr ""
 "A <code>Cache-Control: no-cache</code> és <code>Pragma: no-cache</code> "
 "fejléc küldése a gyorsítótárazott tartalom elkerüléséhez. Ha le van tiltva, "
-"akkor ezek a fejlécek nem lesznek elküldve, és hozzáadhatja a „Cache-Control”"
-" fejlécet azzal az irányelvvel, amelyet használni szeretne „Header” "
+"akkor ezek a fejlécek nem lesznek elküldve, és hozzáadhatja a „Cache-"
+"Control” fejlécet azzal az irányelvvel, amelyet használni szeretne „Header” "
 "beállításként."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:336
@@ -618,7 +618,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 "A DHT (IPv4, IPv6) és az UDP követő által használt UDP figyelési port "
@@ -690,7 +690,7 @@ msgstr "URL megjelenítése"
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -780,8 +780,11 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr "A könyvtár a beállítófájl, a munkamenetfájl és a DHT-fájl tárolásához."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
-msgstr "A könyvtár a letöltött fájl tárolásához. Például <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
+msgstr ""
+"A könyvtár a letöltött fájl tárolásához. Például <code>/mnt/sda1</code>."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
 msgid "The file name of the log file."
@@ -853,8 +856,8 @@ msgid ""
 "PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
 "you have to specify the \"Private key\" as well."
 msgstr ""
-"A FÁJLBAN lévő ügyféltanúsítvány használata. A tanúsítványnak vagy PKCS12 ("
-".p12, .pfx), vagy PEM formátumban kell lennie.<br/>A PKCS12 fájloknak "
+"A FÁJLBAN lévő ügyféltanúsítvány használata. A tanúsítványnak vagy PKCS12 (."
+"p12, .pfx), vagy PEM formátumban kell lennie.<br/>A PKCS12 fájloknak "
 "tartalmazniuk kell a tanúsítványt, egy kulcsot és esetlegesen a további "
 "tanúsítványok láncát. Csak az üres importálási jelszóval rendelkező PKCS12 "
 "fájlok nyithatók meg!<br/>PEM használatakor meg kell adnia a „Személyes "

diff --git a/applications/luci-app-aria2/po/it/aria2.po b/applications/luci-app-aria2/po/it/aria2.po
index 3c71448a4db592a62ba7b103aeb9022e6f3205b4..40506be48f7be8327cc1873f1ab7829903626ff5 100644 (file)
--- a/applications/luci-app-aria2/po/it/aria2.po
+++ b/applications/luci-app-aria2/po/it/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,13 +491,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -621,7 +621,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/ja/aria2.po b/applications/luci-app-aria2/po/ja/aria2.po
index 1f68cb3ab06519630f3d4933c1c106477adb991c..676262b3bc72c678fafc4bae7b61e308f22167ce 100644 (file)
--- a/applications/luci-app-aria2/po/ja/aria2.po
+++ b/applications/luci-app-aria2/po/ja/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,13 +485,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -559,7 +559,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -615,7 +615,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/ko/aria2.po b/applications/luci-app-aria2/po/ko/aria2.po
index 1b671625e6198cfe83c7b6a5cbc92f62f14e1255..600a68021c5686f99250a5f3a01fa9d97f6f0412 100644 (file)
--- a/applications/luci-app-aria2/po/ko/aria2.po
+++ b/applications/luci-app-aria2/po/ko/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,13 +485,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -559,7 +559,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -615,7 +615,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/mr/aria2.po b/applications/luci-app-aria2/po/mr/aria2.po
index 0193ef80134573267d148046a5688a5bdf9ae084..dcc0eb505935c94096d1485b4dcb1ec2840d5fa2 100644 (file)
--- a/applications/luci-app-aria2/po/mr/aria2.po
+++ b/applications/luci-app-aria2/po/mr/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,13 +491,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -621,7 +621,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/ms/aria2.po b/applications/luci-app-aria2/po/ms/aria2.po
index 6f0629e819d3df82a05eca3611563b6f0c80d215..804b64ec7505683a3299e4957dbb7c306b4ee7cc 100644 (file)
--- a/applications/luci-app-aria2/po/ms/aria2.po
+++ b/applications/luci-app-aria2/po/ms/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,13 +491,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -621,7 +621,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/nb_NO/aria2.po b/applications/luci-app-aria2/po/nb_NO/aria2.po
index 394627bc923e1a05f0a954bafdca439248f095bd..84082ba089cde4087c01fdb8af185491b6a21c87 100644 (file)
--- a/applications/luci-app-aria2/po/nb_NO/aria2.po
+++ b/applications/luci-app-aria2/po/nb_NO/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,13 +491,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -621,7 +621,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/pl/aria2.po b/applications/luci-app-aria2/po/pl/aria2.po
index dc15a27dabd73e226b0f312b5d9103d0be2f6909..5829df7737e60937b0149f948ebfc9d2435dfacc 100644 (file)
--- a/applications/luci-app-aria2/po/pl/aria2.po
+++ b/applications/luci-app-aria2/po/pl/aria2.po
@@ -76,8 +76,8 @@ msgstr "Sprawdź certyfikat"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Zamknij połączenie, jeśli prędkość pobierania jest mniejsza lub równa tej "
 "wartości (bajty na sekundę). 0 oznacza, że nie ma dolnej granicy prędkości."
@@ -130,8 +130,8 @@ msgstr "Cache dysku"
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
 msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
 msgstr ""
-"Nie należy rozdzielać zakresu bajtów poniżej 2*SIZE. Możliwe wartości: 1M-"
-"1024M."
+"Nie należy rozdzielać zakresu bajtów poniżej 2*SIZE. Możliwe wartości: "
+"1M-1024M."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
 msgid "Download a file using N connections."
@@ -313,8 +313,8 @@ msgid ""
 "List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
 "netrc</code>."
 msgstr ""
-"Lista dodatkowych ustawień. Format: option=value, np. <code>netrc-path=/tmp/"
-".netrc</code>."
+"Lista dodatkowych ustawień. Format: option=value, np. <code>netrc-path=/tmp/."
+"netrc</code>."
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
 msgid "Loading"
@@ -510,13 +510,9 @@ msgstr "Ponów oczekiwanie"
 msgid "Run daemon as user"
 msgstr "Uruchom daemona jako użytkownik"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr "Zapisz metadane"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 "Zapisz plik kontrolny(*.aria2) co N sekund. Jeśli podano 0, plik kontrolny "
@@ -551,6 +547,10 @@ msgstr ""
 "używany jest BitTorrent Magnet URI. Nazwa pliku jest zakodowana w postaci "
 "pliku hash z przyrostkiem \".torrent\"."
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Zapisz metadane"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Zapisz interwał sesji"
@@ -578,8 +578,8 @@ msgid ""
 "<code>Content-Encoding: deflate</code>."
 msgstr ""
 "Wyślij <code>Accept: deflate, gzip</code> żądaj nagłówka i wywołaj "
-"odpowiedź, jeśli zdalny serwer zareaguje z <code>Content-Encoding: "
-"gzip</code> lub <code>Content-Encoding: deflate</code>."
+"odpowiedź, jeśli zdalny serwer zareaguje z <code>Content-Encoding: gzip</"
+"code> lub <code>Content-Encoding: deflate</code>."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
 msgid ""
@@ -588,8 +588,8 @@ msgid ""
 "you can add Cache-Control header with a directive you like using \"Header\" "
 "option."
 msgstr ""
-"Wyślij <code>Cache-Control: no-cache</code> and <code>Pragma: no-cache</code>"
-" nagłówka w celu uniknięcia buforowania zawartości. Jeśli wyłączono, "
+"Wyślij <code>Cache-Control: no-cache</code> and <code>Pragma: no-cache</"
+"code> nagłówka w celu uniknięcia buforowania zawartości. Jeśli wyłączono, "
 "nagłówki nie są wysyłane i można dodać Cache-Control nagłówka z dyrektywą, "
 "którą lubisz używać w opcji \"Header\"."
 
@@ -599,13 +599,13 @@ msgid ""
 "\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
 "open for incoming TCP traffic."
 msgstr ""
-"Ustaw numer portu TCP dla pobierań BitTorrent. Akceptowalny format: \"6881,"
-"6885\", \"6881-6999\" i \"6881-6889,6999\". Upewnij się, że określone porty "
-"są otwarte dla przychodzącego ruchu TCP."
+"Ustaw numer portu TCP dla pobierań BitTorrent. Akceptowalny format: "
+"\"6881,6885\", \"6881-6999\" i \"6881-6889,6999\". Upewnij się, że określone "
+"porty są otwarte dla przychodzącego ruchu TCP."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 "Ustaw port odsłuchu UDP używany przez DHT(IPv4, IPv6) i tracker UDP. Upewnij "
@@ -675,7 +675,7 @@ msgstr "Pokaż adres URL"
 #, fuzzy
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -705,8 +705,8 @@ msgid ""
 "with this option, seeding ends when at least one of the conditions is "
 "satisfied. Specifying 0 disables seeding after download completed."
 msgstr ""
-"Określ czas seedowania w minutach. Jeśli wraz z tą opcją podana jest opcja \""
-"Współczynnik seedów\", seedowanie zakończy się, gdy spełniony jest "
+"Określ czas seedowania w minutach. Jeśli wraz z tą opcją podana jest opcja "
+"\"Współczynnik seedów\", seedowanie zakończy się, gdy spełniony jest "
 "przynajmniej jeden z warunków. Ustawienie 0 wyłącza seedowanie po "
 "zakończeniu pobierania."
 
@@ -759,8 +759,10 @@ msgstr ""
 "Katalog do przechowywania pliku konfiguracyjnego, pliku sesji i pliku DHT."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
-msgstr "Katalog do zapisu pobranych plików. np. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
+msgstr "Katalog do zapisu pobranych plików. np. <code>/mnt/sda1</code>."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
 msgid "The file name of the log file."

diff --git a/applications/luci-app-aria2/po/pt-br/aria2.po b/applications/luci-app-aria2/po/pt-br/aria2.po
index 133c05c690c23edf97ec61557185c66f6e0ef2c0..70e46cc82edba9f8f55a8350068c581c13971eeb 100644 (file)
--- a/applications/luci-app-aria2/po/pt-br/aria2.po
+++ b/applications/luci-app-aria2/po/pt-br/aria2.po
@@ -80,8 +80,8 @@ msgstr "Verificar o certificado"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Feche a conexão caso a velocidade de download seja menor ou igual a este "
 "valor (em bytes por segundo). 0 significa que não há limite mínimo de "
@@ -135,8 +135,8 @@ msgstr "Cache em Disco"
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
 msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
 msgstr ""
-"Não divida a gama de byte para menos de 2*TAMANHO. Valores possíveis: 1M-"
-"1024M."
+"Não divida a gama de byte para menos de 2*TAMANHO. Valores possíveis: "
+"1M-1024M."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
 msgid "Download a file using N connections."
@@ -323,8 +323,8 @@ msgid ""
 "List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
 "netrc</code>."
 msgstr ""
-"Lista de configurações extras. Formato: option=value, por exemplo <code"
-">netrc-path=/tmp/.netrc</code>."
+"Lista de configurações extras. Formato: option=value, por exemplo "
+"<code>netrc-path=/tmp/.netrc</code>."
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
 msgid "Loading"
@@ -522,13 +522,9 @@ msgstr "Repetir espera"
 msgid "Run daemon as user"
 msgstr "Executar serviço como usuário"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr "Salvar os metadados"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 "Gravar um arquivo de controle (*.aria2) a cada N segundos. Caso este valor "
@@ -563,6 +559,10 @@ msgstr ""
 "apenas quando BitTorrent Magnet URI é usado. O nome do arquivo é hexadecimal "
 "codificado com a informação do hash com o sufixo \".torrent\"."
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Salvar os metadados"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Salvar o intervalo da sessão"
@@ -591,8 +591,8 @@ msgid ""
 "<code>Content-Encoding: deflate</code>."
 msgstr ""
 "Enviar <code>Accept: deflate, gzip</code> requisitar o cabeçalho e inflar a "
-"resposta caso o servidor remoto responda com <code>Content-Encoding: "
-"gzip</code> ou <code>Content-Encoding: deflate</code>."
+"resposta caso o servidor remoto responda com <code>Content-Encoding: gzip</"
+"code> ou <code>Content-Encoding: deflate</code>."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
 msgid ""
@@ -612,13 +612,13 @@ msgid ""
 "\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
 "open for incoming TCP traffic."
 msgstr ""
-"Defina o número da porta TCP para downloads BitTorrent. Formato aceitos: \""
-"6881,6885\", \"6881-6999\" e \"6881-6889,6999\". Certifique-se de que as "
+"Defina o número da porta TCP para downloads BitTorrent. Formato aceitos: "
+"\"6881,6885\", \"6881-6999\" e \"6881-6889,6999\". Certifique-se de que as "
 "portas definidas estão abertas para o tráfego de entrada TCP."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 "Defina a porta de escuta UDP usada pelo DHT(IPv4, IPv6) e pelo rastreador "
@@ -689,7 +689,7 @@ msgstr "Mostrar URL"
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -697,13 +697,13 @@ msgid ""
 "entirely until allocation finishes."
 msgstr ""
 "Especifique o método de alocação de arquivo. Se você está usando sistemas de "
-"arquivos mais novos, como ext4 (com suporte a extents), btrfs, xfs ou NTFS ("
-"somente versões compiladas com MinGW), \"falloc\" é sua melhor escolha. Ele "
+"arquivos mais novos, como ext4 (com suporte a extents), btrfs, xfs ou NTFS "
+"(somente versões compiladas com MinGW), \"falloc\" é sua melhor escolha. Ele "
 "aloca arquivos grandes (com alguns GiB) quase que instantaneamente, mas pode "
-"não estar disponível caso o seu sistema não tenha a função posix_fallocate(3)"
-". Não use \"falloc\" com sistemas de arquivos antigos como ext3 e FAT32 "
-"porque leva quase o mesmo tempo que \"prealloc\" e bloqueia aria2 "
-"completamente até que a alocação termine."
+"não estar disponível caso o seu sistema não tenha a função "
+"posix_fallocate(3). Não use \"falloc\" com sistemas de arquivos antigos como "
+"ext3 e FAT32 porque leva quase o mesmo tempo que \"prealloc\" e bloqueia "
+"aria2 completamente até que a alocação termine."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:368
 msgid ""
@@ -719,9 +719,9 @@ msgid ""
 "with this option, seeding ends when at least one of the conditions is "
 "satisfied. Specifying 0 disables seeding after download completed."
 msgstr ""
-"Especifique o tempo de semeadura em minutos. Se a opção \"Relação de "
-"sementes\" for especificada em conjunto com esta, a semeadura termina quando "
-"pelo menos uma das condições for satisfeita. Ao definir como 0 desativa a "
+"Especifique o tempo de semeadura em minutos. Se a opção \"Relação de sementes"
+"\" for especificada em conjunto com esta, a semeadura termina quando pelo "
+"menos uma das condições for satisfeita. Ao definir como 0 desativa a "
 "semeadura após a conclusão do download."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
@@ -781,10 +781,12 @@ msgstr ""
 "arquivo DHT."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
-"O diretório para armazenar o arquivo baixado, por exemplo, <code>/mnt/"
-"sda1</code>"
+"O diretório para armazenar o arquivo baixado, por exemplo, <code>/mnt/sda1</"
+"code>"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
 msgid "The file name of the log file."

diff --git a/applications/luci-app-aria2/po/pt/aria2.po b/applications/luci-app-aria2/po/pt/aria2.po
index 674e5b916d5f5c81321e9da06502149b77c0ecee..0e3fdce4b30cf0b0f755213f27400d3ec3a2d8bd 100644 (file)
--- a/applications/luci-app-aria2/po/pt/aria2.po
+++ b/applications/luci-app-aria2/po/pt/aria2.po
@@ -75,8 +75,8 @@ msgstr "Verificar o certificado"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Fechar a ligação se a velocidade de transferência for inferior ou igual a "
 "este valor (bytes por segundo). 0 significa que não tem limite de velocidade "
@@ -130,8 +130,8 @@ msgstr "Cache em disco"
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
 msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
 msgstr ""
-"Não dividir um intervale menos de 2*SIZE de bytes. Valores possíveis: 1M-"
-"1024M."
+"Não dividir um intervale menos de 2*SIZE de bytes. Valores possíveis: "
+"1M-1024M."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
 msgid "Download a file using N connections."
@@ -189,7 +189,8 @@ msgstr "Erro"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:44
 msgid "Error: Can't find aria2c in PATH, please reinstall aria2."
-msgstr "Erro: Não consigo encontrar aria2c em PATH, por favor reinstale aria2c."
+msgstr ""
+"Erro: Não consigo encontrar aria2c em PATH, por favor reinstale aria2c."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:482
 msgid "Extra Settings"
@@ -315,8 +316,8 @@ msgid ""
 "List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
 "netrc</code>."
 msgstr ""
-"Lista de configurações adicionais. Formato: opção=valor, por exemplo <code"
-">netrc-path=/tmp/.netrc</code>."
+"Lista de configurações adicionais. Formato: opção=valor, por exemplo "
+"<code>netrc-path=/tmp/.netrc</code>."
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
 msgid "Loading"
@@ -516,13 +517,9 @@ msgstr "Esperar até repetir"
 msgid "Run daemon as user"
 msgstr "Executar serviço como utilizador"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr "Gravar metadados"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 "Gravar um ficheiro de controle (*.aria2) a cada N segundos. Se 0 for dado, "
@@ -557,6 +554,10 @@ msgstr ""
 "quando BitTorrent Magnet URI é usado. O nome do ficheiro é codificado "
 "hexadecimal info hash com o sufixo \".torrent\"."
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Gravar metadados"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Gravar intervalo de sessão"
@@ -586,8 +587,8 @@ msgid ""
 "<code>Content-Encoding: deflate</code>."
 msgstr ""
 "Enviar cabeçalho de solicitação <code>Accept: deflate, gzip</code> e inflar "
-"a resposta se o servidor remoto responder com <code>Content-Encoding: "
-"gzip</code> ou <code>Content-Encoding: deflate</code>.."
+"a resposta se o servidor remoto responder com <code>Content-Encoding: gzip</"
+"code> ou <code>Content-Encoding: deflate</code>.."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
 msgid ""
@@ -607,16 +608,16 @@ msgid ""
 "\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
 "open for incoming TCP traffic."
 msgstr ""
-"Defina o número da porta TCP para desarregas BitTorrent. Aceitar formato: \""
-"6881.6885\", \"6881-6999\" e \"6881-6889,6999\". Certifique-se de que as "
+"Defina o número da porta TCP para desarregas BitTorrent. Aceitar formato: "
+"\"6881.6885\", \"6881-6999\" e \"6881-6889,6999\". Certifique-se de que as "
 "portas especificadas estão abertas para o tráfego TCP de entrada."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
-"Definir a porta de escuta UDP usada pelo DHT(IPv4, IPv6) e pelo rastreador "
+"Definir a porta de escuta UDP usada pelo DHT (IPv4, IPv6) e pelo rastreador "
 "UDP. Certifique-se de que as portas especificadas estão abertas para o "
 "tráfego UDP de entrada."
 
@@ -684,7 +685,7 @@ msgstr "Mostrar URL"
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -714,10 +715,10 @@ msgid ""
 "with this option, seeding ends when at least one of the conditions is "
 "satisfied. Specifying 0 disables seeding after download completed."
 msgstr ""
-"Especifica o tempo de semeadura em minutos. Se a opção \"Relação de "
-"sementes\" for especificada com esta opção, semear termina quando pelo menos "
-"uma das condições for satisfeita. Especificar 0 desativa semear após a "
-"conclusão do descarregamento."
+"Especifica o tempo de semeadura em minutos. Se a opção \"Relação de sementes"
+"\" for especificada com esta opção, semear termina quando pelo menos uma das "
+"condições for satisfeita. Especificar 0 desativa semear após a conclusão do "
+"descarregamento."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
 msgid ""
@@ -774,7 +775,9 @@ msgstr ""
 "ficheiro DHT."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 "O diretório para armazenar o ficheiro descarregado, por exemplo, <code>/mnt/"
 "sda1</code>"
@@ -837,8 +840,8 @@ msgstr ""
 "em formato PKCS12 (.p12, .pfx) ou PEM.<br/>Os ficheiros PKCS12 devem conter "
 "o certificado, uma chave e opcionalmente uma cadeia de certificados "
 "adicionais. Somente ficheiros PKCS12 com uma palavra-passe de importação em "
-"branco podem ser abertos!<br/>Ao usar o PEM, também tem que especificar a \""
-"chave privada RPC\"."
+"branco podem ser abertos!<br/>Ao usar o PEM, também tem que especificar a "
+"\"chave privada RPC\"."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:196
 msgid ""
@@ -852,8 +855,8 @@ msgstr ""
 "formato PKCS12 (.p12, .pfx) ou PEM.<br/>Os ficheiros PKCS12 devem conter o "
 "certificado, uma chave e opcionalmente uma cadeia de certificados "
 "adicionais. Somente ficheiros PKCS12 com uma palavra-passe de importação em "
-"branco podem ser abertos!<br/>Ao usar o PEM, também tem que especificar a \""
-"Private key\"."
+"branco podem ser abertos!<br/>Ao usar o PEM, também tem que especificar a "
+"\"Private key\"."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:150
 msgid ""
@@ -883,8 +886,8 @@ msgstr "Nome de Utilizador e Palavra-passe"
 msgid ""
 "Verify the peer using certificates specified in \"CA certificate\" option."
 msgstr ""
-"Verificar o par usando certificados especificados na opção \"Certificado AC\""
-"."
+"Verificar o par usando certificados especificados na opção \"Certificado AC"
+"\"."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:90
 msgid "Warn"

diff --git a/applications/luci-app-aria2/po/ro/aria2.po b/applications/luci-app-aria2/po/ro/aria2.po
index dc86057f580e35f172a8d11e3a7b9eec42fab02e..6d29c2bdf17275768246d81afe20baf9049ceeea 100644 (file)
--- a/applications/luci-app-aria2/po/ro/aria2.po
+++ b/applications/luci-app-aria2/po/ro/aria2.po
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -492,13 +492,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -522,6 +518,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -566,7 +566,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -622,7 +622,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -685,7 +685,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/ru/aria2.po b/applications/luci-app-aria2/po/ru/aria2.po
index 584720c58958ec3a6b26b352a369092faee41246..3cad2988ab5231802aa6a2ecc49ee6b2ad99f389 100644 (file)
--- a/applications/luci-app-aria2/po/ru/aria2.po
+++ b/applications/luci-app-aria2/po/ru/aria2.po
@@ -79,8 +79,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -497,13 +497,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr "Запуск демона<br />от имени пользователя"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -527,6 +523,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -571,7 +571,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -627,7 +627,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -690,7 +690,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/sk/aria2.po b/applications/luci-app-aria2/po/sk/aria2.po
index 74bbcaad1d856917395d42aeb13968468bbc14c7..adfe80ef523d59ce90f07f713317eb65c3679ed9 100644 (file)
--- a/applications/luci-app-aria2/po/sk/aria2.po
+++ b/applications/luci-app-aria2/po/sk/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,13 +485,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -559,7 +559,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -615,7 +615,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/sv/aria2.po b/applications/luci-app-aria2/po/sv/aria2.po
index 0f90bdf3c5589e4a49535b6a02f742e96b0588e8..50cc81a20a0dcc9fb6bbcfdf9040f8b729f75d0f 100644 (file)
--- a/applications/luci-app-aria2/po/sv/aria2.po
+++ b/applications/luci-app-aria2/po/sv/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,13 +491,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr "Kör daemon som användare"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -621,7 +621,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/templates/aria2.pot b/applications/luci-app-aria2/po/templates/aria2.pot
index 43a68baac80abaf1f4971ec071a45f13c662d803..c02f7f1680cce1ebe7e2eee96651fc0f37ade20c 100644 (file)
--- a/applications/luci-app-aria2/po/templates/aria2.pot
+++ b/applications/luci-app-aria2/po/templates/aria2.pot
@@ -64,8 +64,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -482,13 +482,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -512,6 +508,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -556,7 +556,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -612,7 +612,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -675,7 +675,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/tr/aria2.po b/applications/luci-app-aria2/po/tr/aria2.po
index 305b2667157b40a9a7c047e60707176674b3dd84..fe5efa47c73073c6a32a8d610ad040f5918240d9 100644 (file)
--- a/applications/luci-app-aria2/po/tr/aria2.po
+++ b/applications/luci-app-aria2/po/tr/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,13 +491,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -621,7 +621,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/uk/aria2.po b/applications/luci-app-aria2/po/uk/aria2.po
index b06c3dd9cb16d065222828ac2891aa4afa1b59d4..f78e1211867febeabac4e733a7366ce28ee1c731 100644 (file)
--- a/applications/luci-app-aria2/po/uk/aria2.po
+++ b/applications/luci-app-aria2/po/uk/aria2.po
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -494,13 +494,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -524,6 +520,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -568,7 +568,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -624,7 +624,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -687,7 +687,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/vi/aria2.po b/applications/luci-app-aria2/po/vi/aria2.po
index 6c938dae8d7f18e01bf63fd9989849fbd87fdaa5..8ac93b4dd28d28960867ec6e0cfbf9da61b3564f 100644 (file)
--- a/applications/luci-app-aria2/po/vi/aria2.po
+++ b/applications/luci-app-aria2/po/vi/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,13 +491,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -621,7 +621,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/zh-cn/aria2.po b/applications/luci-app-aria2/po/zh-cn/aria2.po
index 8d10c0da028bec91fbea053ac703cafa99355b52..a60b28abd6f2b1b69792c6d341c0b20fb09cbc84 100644 (file)
--- a/applications/luci-app-aria2/po/zh-cn/aria2.po
+++ b/applications/luci-app-aria2/po/zh-cn/aria2.po
@@ -73,8 +73,8 @@ msgstr "检查证书"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "如果速度小于或等于这个速度（byte/s），关闭下载下载连接。0 表示不限制下载速"
 "度。"
@@ -500,13 +500,9 @@ msgstr "重试等待"
 msgid "Run daemon as user"
 msgstr "以此用户权限运行"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr "保存元数据"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 "每 N 秒保存下载“控制文件”（*.aria2）。设置 0 表示在下载过程中不保存控制文件。"
@@ -537,6 +533,10 @@ msgstr ""
 "将元数据保存到 \".torrent\" 文件。此选项仅在下载连接为 BT 磁力链接时生效。文"
 "件名为 Hash 值，后缀为 \".torrent\"。"
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "保存元数据"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Session 保存间隔"
@@ -589,7 +589,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 "为 DHT（IPv4，IPv6）和 UDP tracker 设置 UDP 监听端口。请确保正确放行了这些端"
@@ -649,7 +649,7 @@ msgstr "显示 URL"
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -725,7 +725,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr "用于放置配置文件，Session 文件和 DHT 文件的目录。"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr "用于放置下载文件的目录。例如：<code>/mnt/sda1</code>"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/po/zh-tw/aria2.po b/applications/luci-app-aria2/po/zh-tw/aria2.po
index 1ba0d2ff61b11d401a26437afbf02a234fd2afdd..83f9b98bbc9b8e4f0c2b228cc5f84fdda0720fab 100644 (file)
--- a/applications/luci-app-aria2/po/zh-tw/aria2.po
+++ b/applications/luci-app-aria2/po/zh-tw/aria2.po
@@ -76,8 +76,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -494,13 +494,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr "以此使用者許可權執行"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -524,6 +520,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -568,7 +568,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -624,7 +624,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -687,7 +687,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81

diff --git a/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2 b/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2
index fc6190d5ace26b01c02c85af2e06b45704c1ec53..a6b485a5c88419970524964cbf3e5fe2218680fb 100755 (executable)
--- a/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2
+++ b/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2
@@ -1,12 +1,5 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@aria2[-1]
-       add ucitrack aria2
-       set ucitrack.@aria2[-1].init=aria2
-       commit ucitrack
-EOF
-
 if [ ."$(uci -q get aria2.main)" != ."aria2" ]; then
        uci -q batch <<-EOF >/dev/null
                add aria2 aria2

diff --git a/applications/luci-app-banip/root/etc/uci-defaults/40_luci-banip b/applications/luci-app-banip/root/etc/uci-defaults/40_luci-banip
index adb22da91d6991518c5da84f55f8e065b8ec99cc..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100755 (executable)
--- a/applications/luci-app-banip/root/etc/uci-defaults/40_luci-banip
+++ b/applications/luci-app-banip/root/etc/uci-defaults/40_luci-banip
@@ -1,11 +1,4 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@banip[-1]
-       add ucitrack banip
-       set ucitrack.@banip[-1].init=banip
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-bcp38/root/etc/uci-defaults/60_luci-bcp38 b/applications/luci-app-bcp38/root/etc/uci-defaults/60_luci-bcp38
index c204236e370c741d413f37c836cbcffa9c1d5514..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100755 (executable)
--- a/applications/luci-app-bcp38/root/etc/uci-defaults/60_luci-bcp38
+++ b/applications/luci-app-bcp38/root/etc/uci-defaults/60_luci-bcp38
@@ -1,11 +1,4 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@bcp38[-1]
-       add ucitrack bcp38
-        add_list ucitrack.@bcp38[0].affects=firewall
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-bmx7/po/bg/bmx7.po b/applications/luci-app-bmx7/po/bg/bmx7.po
index 39d3947f19639c6dda04bcc042c182165c9581b8..d515bea918bd12dbbc627858fddd301915bf3e5d 100644 (file)
--- a/applications/luci-app-bmx7/po/bg/bmx7.po
+++ b/applications/luci-app-bmx7/po/bg/bmx7.po
@@ -21,7 +21,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -55,7 +55,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -152,7 +152,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/ca/bmx7.po b/applications/luci-app-bmx7/po/ca/bmx7.po
index 335f99a70749d3e88a07d21e8a9f88555642f077..4bab1e3eb66bb728134443d5b641b8ae180686c4 100644 (file)
--- a/applications/luci-app-bmx7/po/ca/bmx7.po
+++ b/applications/luci-app-bmx7/po/ca/bmx7.po
@@ -27,7 +27,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -61,7 +61,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -158,7 +158,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/cs/bmx7.po b/applications/luci-app-bmx7/po/cs/bmx7.po
index 781a6895ea5a6472f26e670628ca302f008864da..247ff2ce6e9b29f6d083ed1467741615bc7e8cdb 100644 (file)
--- a/applications/luci-app-bmx7/po/cs/bmx7.po
+++ b/applications/luci-app-bmx7/po/cs/bmx7.po
@@ -27,7 +27,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -61,7 +61,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -158,7 +158,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/de/bmx7.po b/applications/luci-app-bmx7/po/de/bmx7.po
index 864ca767664b9b301142aa874d49e19f848cb0e1..1d4746c1c41f86c1823b1b8bb7c7f6ee869d2d1b 100644 (file)
--- a/applications/luci-app-bmx7/po/de/bmx7.po
+++ b/applications/luci-app-bmx7/po/de/bmx7.po
@@ -27,7 +27,7 @@ msgid "BMX7 revision"
 msgstr "BMX7-Revision"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr "Bandbreite"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -61,7 +61,7 @@ msgid "Link key"
 msgstr "Link-Schlüssel"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr "Link-lokale IPv6"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -158,7 +158,7 @@ msgid "Rating"
 msgstr "Bewertung"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr "Entfernte Linklocal IPv6"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/el/bmx7.po b/applications/luci-app-bmx7/po/el/bmx7.po
index e9611d9cc40e706694ecff8845751cdcd05a7e1a..4263fe5bf3217a16653c35f5ec176292fd34a027 100644 (file)
--- a/applications/luci-app-bmx7/po/el/bmx7.po
+++ b/applications/luci-app-bmx7/po/el/bmx7.po
@@ -27,7 +27,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -61,7 +61,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -158,7 +158,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/en/bmx7.po b/applications/luci-app-bmx7/po/en/bmx7.po
index 90a3c6699eebbd49ce007ca6ca33665063fc15d3..46b3862a5f85fb8561b562dc43afbfae025e6d5f 100644 (file)
--- a/applications/luci-app-bmx7/po/en/bmx7.po
+++ b/applications/luci-app-bmx7/po/en/bmx7.po
@@ -21,7 +21,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -55,7 +55,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -152,7 +152,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/es/bmx7.po b/applications/luci-app-bmx7/po/es/bmx7.po
index 0a48bd995275a6ab293c5566b059233c62efd486..83895cec479453d51afc5ef2e44a6a07341bf20c 100644 (file)
--- a/applications/luci-app-bmx7/po/es/bmx7.po
+++ b/applications/luci-app-bmx7/po/es/bmx7.po
@@ -29,7 +29,7 @@ msgid "BMX7 revision"
 msgstr "Revisión de BMX7"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr "Ancho de banda"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -63,7 +63,7 @@ msgid "Link key"
 msgstr "Clave de enlace"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr "Enlace Local Ipv6"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -160,7 +160,7 @@ msgid "Rating"
 msgstr "Clasificación"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr "Enlace remoto local IPv6"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/fr/bmx7.po b/applications/luci-app-bmx7/po/fr/bmx7.po
index eea7db231c2f3a5aab77240e58a99226ca3e19d7..6e4ee1a6c79a65fd1e0c28307046452f33509a15 100644 (file)
--- a/applications/luci-app-bmx7/po/fr/bmx7.po
+++ b/applications/luci-app-bmx7/po/fr/bmx7.po
@@ -27,7 +27,7 @@ msgid "BMX7 revision"
 msgstr "Révision MBX7"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr "Bande passante"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -61,7 +61,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -158,7 +158,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/he/bmx7.po b/applications/luci-app-bmx7/po/he/bmx7.po
index 3bed4dbb51fddb2d8b87c358fe778ea9dc34a088..65f6c1c8b5834cee5b072c4ef43e1257a0a6fb15 100644 (file)
--- a/applications/luci-app-bmx7/po/he/bmx7.po
+++ b/applications/luci-app-bmx7/po/he/bmx7.po
@@ -21,7 +21,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -55,7 +55,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -152,7 +152,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/hi/bmx7.po b/applications/luci-app-bmx7/po/hi/bmx7.po
index f0d8c8ceca3d098a8f4e4c8a5cc8decee3eeb942..bdbb7f2d0eff197b36c8feed0f71cb06485bf758 100644 (file)
--- a/applications/luci-app-bmx7/po/hi/bmx7.po
+++ b/applications/luci-app-bmx7/po/hi/bmx7.po
@@ -21,7 +21,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -55,7 +55,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -152,7 +152,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/hu/bmx7.po b/applications/luci-app-bmx7/po/hu/bmx7.po
index 5105c715d822b3d54087002d101f57b27cbc28f3..2c1527e463b026711bfe78d8d7fd0ee97bc111f4 100644 (file)
--- a/applications/luci-app-bmx7/po/hu/bmx7.po
+++ b/applications/luci-app-bmx7/po/hu/bmx7.po
@@ -27,7 +27,7 @@ msgid "BMX7 revision"
 msgstr "BMX7 revíziók"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr "Sávszélesség"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -61,7 +61,7 @@ msgid "Link key"
 msgstr "Hivatkozás kulcsa"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr "Kapcsolatszintű IPv6"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -158,7 +158,7 @@ msgid "Rating"
 msgstr "Értékelés"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr "Távoli kapcsolatszintű IPv6"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/it/bmx7.po b/applications/luci-app-bmx7/po/it/bmx7.po
index 2a2e11ad75a3545575820298d3022ea92fecdb3d..40c8a332958d70a79f01015113e4e966d8a665ba 100644 (file)
--- a/applications/luci-app-bmx7/po/it/bmx7.po
+++ b/applications/luci-app-bmx7/po/it/bmx7.po
@@ -27,7 +27,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -61,7 +61,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -158,7 +158,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/ja/bmx7.po b/applications/luci-app-bmx7/po/ja/bmx7.po
index 11e760b4769085f7253c0a20a4f5f98a5e1dcafb..5832fe1a098cb5974a571e99880bff06815e310f 100644 (file)
--- a/applications/luci-app-bmx7/po/ja/bmx7.po
+++ b/applications/luci-app-bmx7/po/ja/bmx7.po
@@ -21,7 +21,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -55,7 +55,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -152,7 +152,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/ko/bmx7.po b/applications/luci-app-bmx7/po/ko/bmx7.po
index ae4493c7255d8acd6ac920d29f74c2d9be58f4ff..65d56f9cefdfa0cf893788971ebc8cff5a53b89d 100644 (file)
--- a/applications/luci-app-bmx7/po/ko/bmx7.po
+++ b/applications/luci-app-bmx7/po/ko/bmx7.po
@@ -21,7 +21,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -55,7 +55,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -152,7 +152,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/mr/bmx7.po b/applications/luci-app-bmx7/po/mr/bmx7.po
index 2af517af73f50bee47969ac0440c7f51b1d5bbd6..7c8180999a2f0f381bda81c45f0a91f5a7fc4225 100644 (file)
--- a/applications/luci-app-bmx7/po/mr/bmx7.po
+++ b/applications/luci-app-bmx7/po/mr/bmx7.po
@@ -27,7 +27,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -61,7 +61,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -158,7 +158,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/ms/bmx7.po b/applications/luci-app-bmx7/po/ms/bmx7.po
index 2afff9ab64ccdbffecebb1e5b926006dc0b5004a..95417e7276674391b6c3061e6cf4bde380622ac2 100644 (file)
--- a/applications/luci-app-bmx7/po/ms/bmx7.po
+++ b/applications/luci-app-bmx7/po/ms/bmx7.po
@@ -21,7 +21,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -55,7 +55,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -152,7 +152,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/nb_NO/bmx7.po b/applications/luci-app-bmx7/po/nb_NO/bmx7.po
index 5e4dd431889a164d11279fa7c40afd93a5b33bc3..c4b086849b9a4fa2e846db39dd13e2fe46a81fb1 100644 (file)
--- a/applications/luci-app-bmx7/po/nb_NO/bmx7.po
+++ b/applications/luci-app-bmx7/po/nb_NO/bmx7.po
@@ -21,7 +21,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -55,7 +55,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -152,7 +152,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/pl/bmx7.po b/applications/luci-app-bmx7/po/pl/bmx7.po
index 5eaf515c695bd8d423af282cc719491d4300e3fd..8b99b77a02cb3e138df8743341e45a576dc55a29 100644 (file)
--- a/applications/luci-app-bmx7/po/pl/bmx7.po
+++ b/applications/luci-app-bmx7/po/pl/bmx7.po
@@ -28,7 +28,7 @@ msgid "BMX7 revision"
 msgstr "Rewizja BMX7"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr "Przepustowość"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -62,7 +62,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -159,7 +159,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/pt/bmx7.po b/applications/luci-app-bmx7/po/pt/bmx7.po
index 8b56e9554d1514fde418cbb3d761bc4950617037..2ee76ff468ebe8904ca6ffa35702f11603dfdefd 100644 (file)
--- a/applications/luci-app-bmx7/po/pt/bmx7.po
+++ b/applications/luci-app-bmx7/po/pt/bmx7.po
@@ -27,7 +27,7 @@ msgid "BMX7 revision"
 msgstr "Revisão do BMX7"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr "Largura de banda"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -61,8 +61,8 @@ msgid "Link key"
 msgstr "Chave de ligação"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
-msgstr "LinkLocal Ipv6"
+msgid "Link-local IPv6"
+msgstr "Link-local IPv6"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
 msgid "Links"
@@ -158,7 +158,7 @@ msgid "Rating"
 msgstr "Classificação"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr "Linklocal IPv6 remoto"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/pt_BR/bmx7.po b/applications/luci-app-bmx7/po/pt_BR/bmx7.po
index 50de021bc028ef0c2847a3a3817e351be9518c2c..7a817eda8d0f9bb58083cbe5a82af8c2aadeda87 100644 (file)
--- a/applications/luci-app-bmx7/po/pt_BR/bmx7.po
+++ b/applications/luci-app-bmx7/po/pt_BR/bmx7.po
@@ -27,8 +27,8 @@ msgid "BMX7 revision"
 msgstr "Revisão do BMX7"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
-msgstr "Largura de banda"
+msgid "Bandwidth"
+msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
 msgid "Bmx7 mesh nodes"
@@ -61,8 +61,8 @@ msgid "Link key"
 msgstr "Chave do link"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
-msgstr "LinkLocal Ipv6"
+msgid "Link-local IPv6"
+msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
 msgid "Links"
@@ -158,8 +158,8 @@ msgid "Rating"
 msgstr "Classificação"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
-msgstr "linklocal IPv6 remoto"
+msgid "Remote link-local IPv6"
+msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82
 msgid "Routes"
@@ -225,3 +225,12 @@ msgstr "Tempo de atividade"
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/nodes_j.htm:79
 msgid "Via Neighbour"
 msgstr "Através de Vizinho"
+
+#~ msgid "Bandwith"
+#~ msgstr "Largura de banda"
+
+#~ msgid "LinkLocal Ipv6"
+#~ msgstr "LinkLocal Ipv6"
+
+#~ msgid "Remote linklocal IPv6"
+#~ msgstr "linklocal IPv6 remoto"

diff --git a/applications/luci-app-bmx7/po/ro/bmx7.po b/applications/luci-app-bmx7/po/ro/bmx7.po
index 5c7fd09a477ee391605fedc384a5065ff7a7711a..239064dbec073ab8053e1f3d2f6f1fde4dc54245 100644 (file)
--- a/applications/luci-app-bmx7/po/ro/bmx7.po
+++ b/applications/luci-app-bmx7/po/ro/bmx7.po
@@ -28,7 +28,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -62,7 +62,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -159,7 +159,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/ru/bmx7.po b/applications/luci-app-bmx7/po/ru/bmx7.po
index e5c6807481f7d015bc2d9415d0885166c0b1d89c..3f63cce6ef5b0ed9186a4856eab1ee7cb7806f76 100644 (file)
--- a/applications/luci-app-bmx7/po/ru/bmx7.po
+++ b/applications/luci-app-bmx7/po/ru/bmx7.po
@@ -28,7 +28,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -62,7 +62,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -159,7 +159,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/sk/bmx7.po b/applications/luci-app-bmx7/po/sk/bmx7.po
index 83fb9a152ad19b43a60cffaa5a7abedf897fe661..67cc23ec578c4fc27d4bffedff53234a1aae3564 100644 (file)
--- a/applications/luci-app-bmx7/po/sk/bmx7.po
+++ b/applications/luci-app-bmx7/po/sk/bmx7.po
@@ -21,7 +21,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -55,7 +55,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -152,7 +152,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/sv/bmx7.po b/applications/luci-app-bmx7/po/sv/bmx7.po
index 52b518e9fa6a6741abf047a0e92c95a266fad4c3..39962744f7de8cbee41ebf05d6b78a10f89ff657 100644 (file)
--- a/applications/luci-app-bmx7/po/sv/bmx7.po
+++ b/applications/luci-app-bmx7/po/sv/bmx7.po
@@ -27,7 +27,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -61,7 +61,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -158,7 +158,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/templates/bmx7.pot b/applications/luci-app-bmx7/po/templates/bmx7.pot
index e8c72f6f3fbdf61932bb979f2ff3102725135127..8f3002858235013466913da57fe248fbf90be1c2 100644 (file)
--- a/applications/luci-app-bmx7/po/templates/bmx7.pot
+++ b/applications/luci-app-bmx7/po/templates/bmx7.pot
@@ -18,7 +18,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -52,7 +52,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -149,7 +149,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/tr/bmx7.po b/applications/luci-app-bmx7/po/tr/bmx7.po
index 6c64138f7037e4045513189f78cfcd626a3ace96..c0fff0ec92975c903c905990f957b99d7c06b1ce 100644 (file)
--- a/applications/luci-app-bmx7/po/tr/bmx7.po
+++ b/applications/luci-app-bmx7/po/tr/bmx7.po
@@ -27,7 +27,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -61,7 +61,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -158,7 +158,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/uk/bmx7.po b/applications/luci-app-bmx7/po/uk/bmx7.po
index 067e5f900be99ae4e950dd5a92a7584c40c243fa..624fc24b888cb35f74c8c69737eb80f34f90a82b 100644 (file)
--- a/applications/luci-app-bmx7/po/uk/bmx7.po
+++ b/applications/luci-app-bmx7/po/uk/bmx7.po
@@ -28,7 +28,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -62,7 +62,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -159,7 +159,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/vi/bmx7.po b/applications/luci-app-bmx7/po/vi/bmx7.po
index b923a21946129fd7fb5e135a5911ec13fa94605f..5977bd4adda35efd83f581e8832d26293e581f1b 100644 (file)
--- a/applications/luci-app-bmx7/po/vi/bmx7.po
+++ b/applications/luci-app-bmx7/po/vi/bmx7.po
@@ -27,7 +27,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -61,7 +61,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -158,7 +158,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/zh-cn/bmx7.po b/applications/luci-app-bmx7/po/zh-cn/bmx7.po
index 64af0495b03578b51e5cd4450be1713f37a078eb..e447e2641a892c80fcb905aa5d5df5ea08d9239d 100644 (file)
--- a/applications/luci-app-bmx7/po/zh-cn/bmx7.po
+++ b/applications/luci-app-bmx7/po/zh-cn/bmx7.po
@@ -27,7 +27,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -61,7 +61,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -158,7 +158,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/po/zh-tw/bmx7.po b/applications/luci-app-bmx7/po/zh-tw/bmx7.po
index e478b227211122703d3c001cca30bec60dbfb687..bbdfe6c176ea7d25c068c1cb4988553f82a02497 100644 (file)
--- a/applications/luci-app-bmx7/po/zh-tw/bmx7.po
+++ b/applications/luci-app-bmx7/po/zh-tw/bmx7.po
@@ -21,7 +21,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -55,7 +55,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -152,7 +152,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82

diff --git a/applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm b/applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm
index b7609d7a523be33ca6415a4264c14e6d7da5ef9d..8ecae656f73c3f442b7eeb7d2c7a092389005a0d 100644 (file)
--- a/applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm
+++ b/applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm
@@ -58,7 +58,7 @@
                        <div class="th"><%:State%></div>
                        <div class="th"><%:Type%></div>
                        <div class="th"><%:Max rate%></div>
-                       <div class="th"><%:LinkLocal Ipv6%></div>
+                       <div class="th"><%:Link-local IPv6%></div>
                        <div class="th"><%:RX BpP%></div>
                        <div class="th"><%:TX BpP%></div>
                </div>
@@ -75,7 +75,7 @@
                        <div class="th"><%:Short ID%></div>
                        <div class="th"><%:Name%></div>
                        <div class="th"><%:Link key%></div>
-                       <div class="th"><%:Remote linklocal IPv6%></div>
+                       <div class="th"><%:Remote link-local IPv6%></div>
                        <div class="th"><%:Device%></div>
                        <div class="th"><%:RX rate%></div>
                        <div class="th"><%:TX rate%></div>

diff --git a/applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm b/applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm
index aaa79a8f4e91ef527b2a3089cf62c810e634d758..9348e7c610606bd7bf368d1e7ca5fb89e88d9da9 100644 (file)
--- a/applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm
+++ b/applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm
@@ -38,7 +38,7 @@
                        <div class="th"><%:Name%></div>
                        <div class="th"><%:Node%></div>
                        <div class="th"><%:Network%></div>
-                       <div class="th"><%:Bandwith%></div>
+                       <div class="th"><%:Bandwidth%></div>
                        <div class="th"><%:Local net%></div>
                        <div class="th"><%:Path Metric%></div>
                        <div class="th"><%:Tun Metric%></div>

diff --git a/applications/luci-app-dcwapd/root/etc/uci-defaults/60_luci-dcwapd b/applications/luci-app-dcwapd/root/etc/uci-defaults/60_luci-dcwapd
index 36455f834f63abd2fab5422f39b79d75d79e54f8..c52d3c26b35fd40696a3bd45f3aab0663ed0d4d9 100644 (file)
--- a/applications/luci-app-dcwapd/root/etc/uci-defaults/60_luci-dcwapd
+++ b/applications/luci-app-dcwapd/root/etc/uci-defaults/60_luci-dcwapd
@@ -1,11 +1,3 @@
 #!/bin/sh
 
-# register commit handler
-uci -q batch <<-EOF >/dev/null
-    delete ucitrack.@dcwapd[-1]
-    add ucitrack dcwapd
-    set ucitrack.@dcwapd[-1].init=dcwapd
-    commit ucitrack
-EOF
-
 exit 0

diff --git a/applications/luci-app-dnscrypt-proxy/root/etc/uci-defaults/60_luci-dnscrypt-proxy b/applications/luci-app-dnscrypt-proxy/root/etc/uci-defaults/60_luci-dnscrypt-proxy
index ec4da17c9a343a92b227c841a96342f71c659da4..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100755 (executable)
--- a/applications/luci-app-dnscrypt-proxy/root/etc/uci-defaults/60_luci-dnscrypt-proxy
+++ b/applications/luci-app-dnscrypt-proxy/root/etc/uci-defaults/60_luci-dnscrypt-proxy
@@ -1,11 +1,4 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@dnscrypt-proxy[-1]
-       add ucitrack dnscrypt-proxy
-       set ucitrack.@dnscrypt-proxy[-1].init=dnscrypt-proxy
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-dump1090/root/etc/uci-defaults/40_luci-dump1090 b/applications/luci-app-dump1090/root/etc/uci-defaults/40_luci-dump1090
index 4475d2fb931bfac72b2624a4e69ae0cedbf3b19f..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100644 (file)
--- a/applications/luci-app-dump1090/root/etc/uci-defaults/40_luci-dump1090
+++ b/applications/luci-app-dump1090/root/etc/uci-defaults/40_luci-dump1090
@@ -1,12 +1,4 @@
 #!/bin/sh
 
-# needed for "Save and Apply" to restart dump1090
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@dump1090[-1]
-       add ucitrack dump1090
-       set ucitrack.@dump1090[-1].init="dump1090"
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
index f40e0c73e1b3f759ecb28fef12e937a5b5a6cf61..a0d4cfc063b26e8bc4908033ce62128370406bac 100644 (file)
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
@@ -109,6 +109,38 @@ function rule_target_txt(s) {
                return fmt('<var>%s</var>', t);
 }
 
+function update_ip_hints(map, section_id, family, hosts) {
+       var elem_src_ip = map.lookupOption('src_ip', section_id)[0].getUIElement(section_id),
+           elem_dst_ip = map.lookupOption('dest_ip', section_id)[0].getUIElement(section_id),
+           choice_values = [], choice_labels = {};
+
+       elem_src_ip.clearChoices();
+       elem_dst_ip.clearChoices();
+
+       if (!family || family == 'ipv4') {
+               L.sortedKeys(hosts, 'ipv4', 'addr').forEach(function(mac) {
+                       var val = hosts[mac].ipv4,
+                           txt = '%s (<strong>%s</strong>)'.format(val, hosts[mac].name || mac);
+
+                       choice_values.push(val);
+                       choice_labels[val] = txt;
+               });
+       }
+
+       if (!family || family == 'ipv6') {
+               L.sortedKeys(hosts, 'ipv6', 'addr').forEach(function(mac) {
+                       var val = hosts[mac].ipv6,
+                           txt = '%s (<strong>%s</strong>)'.format(val, hosts[mac].name || mac);
+
+                       choice_values.push(val);
+                       choice_labels[val] = txt;
+               });
+       }
+
+       elem_src_ip.addChoices(choice_values, choice_labels);
+       elem_dst_ip.addChoices(choice_values, choice_labels);
+}
+
 return L.view.extend({
        callHostHints: rpc.declare({
                object: 'luci-rpc',
@@ -201,6 +233,10 @@ return L.view.extend({
                o.value('', _('IPv4 and IPv6'));
                o.value('ipv4', _('IPv4 only'));
                o.value('ipv6', _('IPv6 only'));
+               o.validate = function(section_id, value) {
+                       update_ip_hints(this.map, section_id, value, hosts);
+                       return true;
+               };
 
                o = s.taboption('general', form.Value, 'proto', _('Protocol'));
                o.modalonly = true;
@@ -283,12 +319,7 @@ return L.view.extend({
                o.modalonly = true;
                o.datatype = 'list(neg(ipmask))';
                o.placeholder = _('any');
-               L.sortedKeys(hosts, 'ipv4', 'addr').forEach(function(mac) {
-                       o.value(hosts[mac].ipv4, '%s (%s)'.format(
-                               hosts[mac].ipv4,
-                               hosts[mac].name || mac
-                       ));
-               });
+               o.transformChoices = function() { return {} }; /* force combobox rendering */
 
                o = s.taboption('general', form.Value, 'src_port', _('Source port'));
                o.modalonly = true;
@@ -309,12 +340,7 @@ return L.view.extend({
                o.modalonly = true;
                o.datatype = 'list(neg(ipmask))';
                o.placeholder = _('any');
-               L.sortedKeys(hosts, 'ipv4', 'addr').forEach(function(mac) {
-                       o.value(hosts[mac].ipv4, '%s (%s)'.format(
-                               hosts[mac].ipv4,
-                               hosts[mac].name || mac
-                       ));
-               });
+               o.transformChoices = function() { return {} }; /* force combobox rendering */
 
                o = s.taboption('general', form.Value, 'dest_port', _('Destination port'));
                o.modalonly = true;
@@ -349,12 +375,18 @@ return L.view.extend({
                o.value('Thu', _('Thursday'));
                o.value('Fri', _('Friday'));
                o.value('Sat', _('Saturday'));
+               o.write = function(section_id, value) {
+                       return this.super('write', [ section_id, L.toArray(value).join(' ') ]);
+               };
 
                o = s.taboption('timed', form.MultiValue, 'monthdays', _('Month Days'));
                o.modalonly = true;
                o.multiple = true;
                o.display_size = 15;
                o.placeholder = _('Any day');
+               o.write = function(section_id, value) {
+                       return this.super('write', [ section_id, L.toArray(value).join(' ') ]);
+               };
                for (var i = 1; i <= 31; i++)
                        o.value(i);
 

diff --git a/applications/luci-app-firewall/luasrc/controller/firewall.lua b/applications/luci-app-firewall/luasrc/controller/firewall.lua
deleted file mode 100644 (file)
index 5f8cb6e..0000000
--- a/applications/luci-app-firewall/luasrc/controller/firewall.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-module("luci.controller.firewall", package.seeall)
-
-function index()
-       entry({"admin", "network", "firewall"},
-               alias("admin", "network", "firewall", "zones"),
-               _("Firewall"), 60)
-
-       entry({"admin", "network", "firewall", "zones"},
-               view("firewall/zones"), _("General Settings"), 10)
-
-       entry({"admin", "network", "firewall", "forwards"},
-               view("firewall/forwards"), _("Port Forwards"), 20)
-
-       entry({"admin", "network", "firewall", "rules"},
-               view("firewall/rules"), _("Traffic Rules"), 30)
-
-       entry({"admin", "network", "firewall", "custom"},
-               view("firewall/custom"), _("Custom Rules"), 40).leaf = true
-end

diff --git a/applications/luci-app-firewall/po/bg/firewall.po b/applications/luci-app-firewall/po/bg/firewall.po
index 4e2b2320c9179b43324e43e0c2641950091b210e..41779413754756bf725b71b6e449179d00550d1b 100644 (file)
--- 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 2c147665eb63095143a4ed771350a7ed42e90336..3558ee419ee293ae44c70d847ad04c26b031d7f4 100644 (file)
--- 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 07cdd7339881643e1aefc397a628f6d1d1258a1a..704a7905cd11f92f01b33b0060cae0f9b4067258 100644 (file)
--- 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 619ef03aaf3f8b2bbd5bbd9703c304c12412533b..08ab8374d6f97d27d66fd58efe7777f603961561 100644 (file)
--- 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"
 
@@ -667,7 +667,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 d37baa6e605872b972aeac1603490dd86d78ba12..8103329a1a96bca745614a8441cd3bd8e3e6d56e 100644 (file)
--- 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 56e8a0360a6d5bcc367e188b5bb156f1e8a7ddb5..76aa96fb602345505f46314f67c57b5ef2dcd94d 100644 (file)
--- 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 255f8b9092205d2501bc823b2f3a6cadf35b0a43..295f9c7aa9a4c1820310ab0f6ccf974445db0fb9 100644 (file)
--- 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 72bdf20139c9d889ec02c5c1b3e0f0cd41f686b1..d3dba5b9711b3a6b0f12fbb7ba39d13872b150f1 100644 (file)
--- 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 179ab1624fd2b093910e3f22a7752b373ab51e01..de89c5e45205e44f29a9916b0b55910325524a43 100644 (file)
--- 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 68fdf498b6581a81c8c09c397f9e7eaa3dcb1f83..339985674810d0c2fddefbe2a8639794a9fdbc15 100644 (file)
--- 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 d0c765ee645351c5d09cccfb2fb78db28d5e3d2f..da34d5dc52a93e693b8b4ea79982c04568e80277 100644 (file)
--- a/applications/luci-app-firewall/po/hu/firewall.po
+++ b/applications/luci-app-firewall/po/hu/firewall.po
@@ -134,7 +134,7 @@ msgstr "Lefedett hálózatok"
 msgid "Covered subnets"
 msgstr "Lefedett alhálózatok"
 
-#: 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"
 
@@ -249,7 +249,7 @@ msgstr "További iptables argumentumok"
 msgid "Extra source arguments"
 msgstr "További forrásargumentumok"
 
-#: 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"
 
@@ -313,7 +313,7 @@ msgstr "Ettől: %s, <var>ezen az eszközön</var>, ezekkel a forrásokkal: %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 "Általános beállítások"
 
@@ -479,7 +479,7 @@ msgstr ""
 "összes szolgáltatást."
 
 #: 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 "Porttovábbítások"
 
@@ -664,7 +664,7 @@ msgid "To %s, %s in %s"
 msgstr "Erre: %s, %s ebben: %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 "Forgalmi szabályok"
 

diff --git a/applications/luci-app-firewall/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po
index df09c8a0c32281002fa5b297718cad8a3f18628a..df910114431e42a7033085c68fb5c7f7415aa789 100644 (file)
--- 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 71a3d47356e979c9ea4117904ab26c886f7ee3ef..59d3fd6ca4e2f4157dbcbaf70ea0f0f3ad62c6b5 100644 (file)
--- 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 b3caa3673fc596d5303ba42c61b5d47affa7226b..e6a932b8b9f7b0705fa1eb0a03cc319f194fd5fc 100644 (file)
--- 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 37fdcb997862e8bb9930678831dd394e79e6a3da..782a033328206d63f16b5de9e87a59c744a10ee8 100644 (file)
--- 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 60de67aa74cc7888fbf97e3dcff3f8fc1424766d..09a20af4b2d1df5e839bb3444f0870e09c92041c 100644 (file)
--- a/applications/luci-app-firewall/po/ms/firewall.po
+++ b/applications/luci-app-firewall/po/ms/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/no/firewall.po b/applications/luci-app-firewall/po/no/firewall.po
index f6f1daa929bc93e56102a21f22e934842ba0a905..96cc6f03721c421270565e87ec42d11515db3739 100644 (file)
--- 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 86459989f0f36a3014cb2604c0c0bf50b76be79a..3a3a76c1475f5a47ead1c15ab0a56ab7b34086b2 100644 (file)
--- 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 2cb5e898528e1869b340c962454595e96dc869ee..4e9ec010690d7f0c0c432f7ce87bf8d4a7781d2c 100644 (file)
--- 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 2c3c6f95857c6221c35aa3e821379605c48886b2..f2093b85437cae2b4dee482f6528c03ae10c8f63 100644 (file)
--- 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 b3dd63730b8b1dd12558da0240ad2449f01a4924..eaf3d337a64dc3c2185177f3dc310be891a7d6db 100644 (file)
--- 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 256f82b3896a754c5caaa059da2572073a38c22e..ec43677489e66a6e4d3b735e7bf2fe115253de77 100644 (file)
--- 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 e5d73e2d0f6883b1d6be9d73647f6fe6304d8ed8..d31bcfefaf207ea72bf3f59f9f1aec77e380ca4e 100644 (file)
--- 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 6a761b0f36bef0081a564919d8bee7fac3514454..655e1bf5140e9f4559f92c631fab8e9a9cbe07de 100644 (file)
--- 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 8d290d664f252dd5858b8a751bf23bb8a58582cf..91d3bd45860b48092e73969d9d587d5a6309b909 100644 (file)
--- 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 f3d850961e5a2f07e5cbb18c1f463cf549751dc9..1db3c11272dcc3c91005e25dedad3c936f743219 100644 (file)
--- 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 2aeaedecc1abe64cd1e7078615c426d12b8c2a38..39272a55eef9e0bf3305dc9f52ea22a95003e1c0 100644 (file)
--- 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 068b3954c5c83992b755369a40dff796a7c11aa4..6b84e0f5a0b770cadbbb154b7aa39e0dc1c6851c 100644 (file)
--- 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 e64d006c625a89bfa267c6c7539f0e67bc5512d8..7e9e06af77e49365ef6409f36a3e9893d85a7aee 100644 (file)
--- 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 167e680516f70af0615b28e7d1ab4078fa3b2791..231efc399f6bae680a90ab44f1e9d4b8d42ca8f3 100644 (file)
--- a/applications/luci-app-firewall/po/zh-tw/firewall.po
+++ b/applications/luci-app-firewall/po/zh-tw/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 "自訂規則"
 
@@ -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 "來自 %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 "基本設定"
 
@@ -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 "埠轉發"
 
@@ -627,7 +627,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/root/usr/share/luci/menu.d/luci-app-firewall.json b/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json
new file mode 100644 (file)
index 0000000..c414f36
--- /dev/null
+++ b/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json
@@ -0,0 +1,50 @@
+{
+       "admin/network/firewall": {
+               "title": "Firewall",
+               "order": 60,
+               "action": {
+                       "type": "alias",
+                       "path": "admin/network/firewall/zones"
+               },
+               "depends": {
+                       "fs": { "/sbin/fw3": "executable" },
+                       "uci": { "firewall": true }
+               }
+       },
+
+       "admin/network/firewall/zones": {
+               "title": "General Settings",
+               "order": 10,
+               "action": {
+                       "type": "view",
+                       "path": "firewall/zones"
+               }
+       },
+
+       "admin/network/firewall/forwards": {
+               "title": "Port Forwards",
+               "order": 20,
+               "action": {
+                       "type": "view",
+                       "path": "firewall/forwards"
+               }
+       },
+
+       "admin/network/firewall/rules": {
+               "title": "Traffic Rules",
+               "order": 30,
+               "action": {
+                       "type": "view",
+                       "path": "firewall/rules"
+               }
+       },
+
+       "admin/network/firewall/custom": {
+               "title": "Custom Rules",
+               "order": 40,
+               "action": {
+                       "type": "view",
+                       "path": "firewall/custom"
+               }
+       }
+}

diff --git a/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua b/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua
index 43583744409b2019279fbb43dc53b7b8ddb837a9..9ae754cb93f1b8d9a1d9a0b78d471f82c6a0eda3 100644 (file)
--- a/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua
+++ b/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua
@@ -14,22 +14,22 @@ qr = s:option(DummyValue, "note0", "dummy")
 qr.tmp = tmp
 qr.template = "fwknopd-qr"
 qr:depends("uci_enabled", "1")
-s:option(Value, "SOURCE", "SOURCE", translate("Use ANY for any source ip"))
+s:option(Value, "SOURCE", "SOURCE", translate("Use ANY for any source IP"))
 k1 = s:option(Value, "KEY", "KEY", translate("Define the symmetric key used for decrypting an incoming SPA packet that is encrypted by the fwknop client with Rijndael."))
 k1:depends("keytype", translate("Normal Key"))
 k2 = s:option(Value, "KEY_BASE64", "KEY_BASE64", translate("Define the symmetric key used for decrypting an incoming SPA \
                                                packet that is encrypted by the fwknop client with Rijndael."))
-k2:depends("keytype", translate("Base 64 key"))
+k2:depends("keytype", translate("Base64 key"))
 l1 = s:option(ListValue, "keytype", "Key type")
 l1:value("Normal Key", "Normal Key")
-l1:value("Base 64 key", "Base 64 key")
+l1:value("Base64 key", "Base64 key")
 k3 = s:option(Value, "HMAC_KEY", "HMAC_KEY", "The hmac key")
 k3:depends("hkeytype", "Normal Key")
 k4 = s:option(Value, "HMAC_KEY_BASE64", "HMAC_KEY_BASE64", translate("The base64 hmac key"))
-k4:depends("hkeytype", "Base 64 key")
+k4:depends("hkeytype", "Base64 key")
 l2 = s:option(ListValue, "hkeytype", "HMAC Key type")
 l2:value("Normal Key", "Normal Key")
-l2:value("Base 64 key", "Base 64 key")
+l2:value("Base64 key", "Base64 key")
 s:option(Value, "OPEN_PORTS", "OPEN_PORTS", translate("Define a set of ports and protocols (tcp or udp) that will be opened if a valid knock sequence is seen. \
                                        If this entry is not set, fwknopd will attempt to honor any proto/port request specified in the SPA data \
                                        (unless of it matches any “RESTRICT_PORTS” entries). Multiple entries are comma-separated."))
@@ -43,7 +43,7 @@ s:option(Value, "REQUIRE_SOURCE_ADDRESS", "REQUIRE_SOURCE_ADDRESS", translate("F
 
 s = m:section(TypedSection, "config", translate("fwknopd.conf config options")) 
 s.anonymous=true
-s:option(Value, "MAX_SPA_PACKET_AGE", "MAX_SPA_PACKET_AGE", translate("Maximum age in seconds that an SPA packet will be accepted. defaults to 120 seconds"))
+s:option(Value, "MAX_SPA_PACKET_AGE", "MAX_SPA_PACKET_AGE", translate("Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 seconds."))
 s:option(Value, "PCAP_INTF", "PCAP_INTF", translate("Specify the ethernet interface on which fwknopd will sniff packets."))
 s:option(Value, "ENABLE_IPT_FORWARDING", "ENABLE_IPT_FORWARDING", translate("Allow SPA clients to request access to services through an iptables firewall instead of just to it."))
 s:option(Value, "ENABLE_NAT_DNS", "ENABLE_NAT_DNS", translate("Allow SPA clients to request forwarding destination by DNS name."))

diff --git a/applications/luci-app-fwknopd/po/bg/fwknopd.po b/applications/luci-app-fwknopd/po/bg/fwknopd.po
index a7e3dae36ec9ebd1d4687a42e2a562e542833246..43fc875d9f3af67f7cc998aeac414b7e359be6d7 100644 (file)
--- a/applications/luci-app-fwknopd/po/bg/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/bg/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/ca/fwknopd.po b/applications/luci-app-fwknopd/po/ca/fwknopd.po
index e0026e13dd6f39de8a4e1c2fe306cd0c4af2b3ae..d15973e0915c9db4e3c7e57f76102b2e55198e73 100644 (file)
--- a/applications/luci-app-fwknopd/po/ca/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/ca/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/cs/fwknopd.po b/applications/luci-app-fwknopd/po/cs/fwknopd.po
index da1273fff3ea8e136848c182adb84cf436f75321..3d35d28ad13cb5c56ba1f448df771480dc11016e 100644 (file)
--- a/applications/luci-app-fwknopd/po/cs/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/cs/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/de/fwknopd.po b/applications/luci-app-fwknopd/po/de/fwknopd.po
index 438e17679d36c5f516dc5f52c40aee136aa543ff..0c999546bb0a05d1d2233c0bf288d4e0c0f3e3ae 100644 (file)
--- a/applications/luci-app-fwknopd/po/de/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/de/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/el/fwknopd.po b/applications/luci-app-fwknopd/po/el/fwknopd.po
index ac258002f36edbf38f672e008e01c014aa0f38db..7bd4fc74fe80754db0286166e89e06b1232442ed 100644 (file)
--- a/applications/luci-app-fwknopd/po/el/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/el/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/en/fwknopd.po b/applications/luci-app-fwknopd/po/en/fwknopd.po
index 045472d3a28f92f6e07e117483581ef7e8862cd1..7bfe5d197e7be693d9509d53fb8ec87b658b627b 100644 (file)
--- a/applications/luci-app-fwknopd/po/en/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/en/fwknopd.po
@@ -23,8 +23,8 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
-msgstr "Base 64 key"
+msgid "Base64 key"
+msgstr "Base64 key"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
 msgid ""
@@ -91,11 +91,11 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
 msgid "Normal Key"
@@ -110,8 +110,8 @@ msgid "The base64 hmac key"
 msgstr "The base64 hmac key"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
-msgstr "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
+msgstr "Use ANY for any source IP"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8
 msgid ""

diff --git a/applications/luci-app-fwknopd/po/es/fwknopd.po b/applications/luci-app-fwknopd/po/es/fwknopd.po
index f772886d118f8e723aa4a5ffec9e21e1dd112e05..8ca5780186c57dfa7080bf7e76694aba504279ce 100644 (file)
--- a/applications/luci-app-fwknopd/po/es/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/es/fwknopd.po
@@ -27,7 +27,7 @@ msgstr ""
 "Permitir que los clientes SPA soliciten el destino de reenvío por nombre DNS."
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr "Llave base 64"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -98,8 +98,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 "Edad máxima en segundos que se aceptará un paquete de SPA. De manera "
 "predeterminada a 120 segundos"
@@ -118,7 +118,7 @@ msgid "The base64 hmac key"
 msgstr "La clave hmac base64"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr "Use CUALQUIERA para cualquier fuente ip"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/fr/fwknopd.po b/applications/luci-app-fwknopd/po/fr/fwknopd.po
index d698ea148a9999c82ffd5868d3b4bca7cc488ae5..0980a82a52b703d0e7d7c74cc690e163475a8fad 100644 (file)
--- a/applications/luci-app-fwknopd/po/fr/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/fr/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/he/fwknopd.po b/applications/luci-app-fwknopd/po/he/fwknopd.po
index 02778a5beeaeb4db4248e5c844487fd173a820d1..2ae9d4a9e1fad672e7b4e7960474848b1372a688 100644 (file)
--- a/applications/luci-app-fwknopd/po/he/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/he/fwknopd.po
@@ -22,7 +22,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -75,8 +75,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -92,7 +92,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/hi/fwknopd.po b/applications/luci-app-fwknopd/po/hi/fwknopd.po
index da7581116b06b71b952a59187f1f27ed5c7cb2d6..27826a4acd88c55749241408a836a872104584a4 100644 (file)
--- a/applications/luci-app-fwknopd/po/hi/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/hi/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/hu/fwknopd.po b/applications/luci-app-fwknopd/po/hu/fwknopd.po
index bb137bd8caaa0ff91b1674460d970af511c3f35d..3f099d9fe7d8239c5f8954f0204822b1b207b17c 100644 (file)
--- a/applications/luci-app-fwknopd/po/hu/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/hu/fwknopd.po
@@ -27,7 +27,7 @@ msgstr ""
 "név alapján."
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr "Base64 kulcs"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -99,8 +99,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 "Legnagyobb életkor másodpercben, amíg egy SPA csomag elfogadásra kerül. "
 "Alapértelmezetten 120 másodperc."
@@ -120,7 +120,7 @@ msgid "The base64 hmac key"
 msgstr "A Base64 hmac kulcs"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr "BÁRMELY használata bármely forrás IP-nél"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/it/fwknopd.po b/applications/luci-app-fwknopd/po/it/fwknopd.po
index 1e3debe38387c438a1b8bfa9a4a35cbcb5b1f781..8f30a56c37032764dcbf67810bf9d81251edbf0f 100644 (file)
--- a/applications/luci-app-fwknopd/po/it/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/it/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/ja/fwknopd.po b/applications/luci-app-fwknopd/po/ja/fwknopd.po
index 26b9302bcf75be07ddf701687be3ee84fbd38662..fcc4fa4d2a9ef9923a62a9f76b46ca29109f7500 100644 (file)
--- a/applications/luci-app-fwknopd/po/ja/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/ja/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/ko/fwknopd.po b/applications/luci-app-fwknopd/po/ko/fwknopd.po
index 99491f4c3fe7aad60494b0148245377514789204..43cc7a71d38583f741dc7b619894f69e94fdcbcc 100644 (file)
--- a/applications/luci-app-fwknopd/po/ko/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/ko/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/mr/fwknopd.po b/applications/luci-app-fwknopd/po/mr/fwknopd.po
index d5e0e968eef15cd991c4481c82a8e398bf93c7a4..e94376fa0a31847cff6d29639e3c8d10361f0b38 100644 (file)
--- a/applications/luci-app-fwknopd/po/mr/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/mr/fwknopd.po
@@ -23,7 +23,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr "बेस 64 की"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -76,8 +76,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -93,7 +93,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/ms/fwknopd.po b/applications/luci-app-fwknopd/po/ms/fwknopd.po
index 32294f1855a4654880bfbe19ab10cf4c4a0dbd84..c0f5b9d00e36ab9d391770fbe68431d649fac327 100644 (file)
--- a/applications/luci-app-fwknopd/po/ms/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/ms/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/nb_NO/fwknopd.po b/applications/luci-app-fwknopd/po/nb_NO/fwknopd.po
index 01310db69d5f58177feaabd8aaad3cd0d3b00543..4403519b6e944fc5cdaf90fcb12bdac5f66289db 100644 (file)
--- a/applications/luci-app-fwknopd/po/nb_NO/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/nb_NO/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/pl/fwknopd.po b/applications/luci-app-fwknopd/po/pl/fwknopd.po
index a5ac7bc67b681b87b0e2b9189785e9171e117eae..0bc64eb6377d40c7d04be940bd1e4e03a3aac1e2 100644 (file)
--- a/applications/luci-app-fwknopd/po/pl/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/pl/fwknopd.po
@@ -24,8 +24,8 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
-msgstr "Klucz Base 64"
+msgid "Base64 key"
+msgstr "Klucz Base64"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
 msgid ""
@@ -77,8 +77,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -94,7 +94,7 @@ msgid "The base64 hmac key"
 msgstr "Klucz HMAC Base64"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/pt-br/fwknopd.po b/applications/luci-app-fwknopd/po/pt-br/fwknopd.po
index e7c8ed21219f0e0af2f5075ec6adec017a751173..aef59065aa04415e8564697eb309678f0d9b35bb 100644 (file)
--- a/applications/luci-app-fwknopd/po/pt-br/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/pt-br/fwknopd.po
@@ -27,7 +27,7 @@ msgstr ""
 "Permitir que clientes SPA requeiram encaminhamento de destinos por nome DNS."
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr "Chave em formato base64"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -96,8 +96,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 "Idade máxima, em segundos, que um pacote SPA será aceito. O padrão é de 120 "
 "segundos"
@@ -116,7 +116,7 @@ msgid "The base64 hmac key"
 msgstr "A chave de autenticação HMAC em formato base64"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr "Use \"ANY\" para qualquer endereço IP de origem"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/pt/fwknopd.po b/applications/luci-app-fwknopd/po/pt/fwknopd.po
index daa662efd9087f6ec0168d648761a1ddf512ec42..0e8a41281c395ae7f9c0c00c14940362de1c3bd3 100644 (file)
--- a/applications/luci-app-fwknopd/po/pt/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/pt/fwknopd.po
@@ -27,7 +27,7 @@ msgstr ""
 "nome de DNS."
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr "Chave da base 64"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -97,8 +97,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 "Idade máxima em segundos que um pacote SPA será aceite. Predefinido a 120 "
 "segundos"
@@ -116,7 +116,7 @@ msgid "The base64 hmac key"
 msgstr "A chave hmac base64"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr "Use qualquer um (ANY) para qualquer fonte ip"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/ro/fwknopd.po b/applications/luci-app-fwknopd/po/ro/fwknopd.po
index 756a895a270948bd4433a4f6c503045952b3531c..26c160cc11b2aaef076944b3f28725fbd7c51a33 100644 (file)
--- a/applications/luci-app-fwknopd/po/ro/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/ro/fwknopd.po
@@ -22,7 +22,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -75,8 +75,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -92,7 +92,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/ru/fwknopd.po b/applications/luci-app-fwknopd/po/ru/fwknopd.po
index 23070e96350af79cc7463d312de68ccd444e0979..0e7e594174efb8ba3233e17194ca6c17bfd7c64f 100644 (file)
--- a/applications/luci-app-fwknopd/po/ru/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/ru/fwknopd.po
@@ -29,7 +29,7 @@ msgstr ""
 "Разрешить SPA клиентам запрашивать направление переадресации по DNS-имени."
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr "64-битный ключ"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -100,8 +100,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 "Максимальное время в секундах, в течение которых будет принят SPA пакет, по "
 "умолчанию 120 секунд."
@@ -119,7 +119,7 @@ msgid "The base64 hmac key"
 msgstr "Ключ Base64 HMAC."
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr "Использовать ЛЮБОЙ, для любого исходящего IP."
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/sk/fwknopd.po b/applications/luci-app-fwknopd/po/sk/fwknopd.po
index f0a37ecd682c48e41beeb24261555e4a71575314..7cce5996a27cbc0cada328f16d4c1bd03f9ff5d4 100644 (file)
--- a/applications/luci-app-fwknopd/po/sk/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/sk/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/sv/fwknopd.po b/applications/luci-app-fwknopd/po/sv/fwknopd.po
index c1c7cbef5d404d0645e5e59a833053065f87646e..6ec57093ca08ce6ebcb13fef1c8a3a28f8c90914 100644 (file)
--- a/applications/luci-app-fwknopd/po/sv/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/sv/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/tr/fwknopd.po b/applications/luci-app-fwknopd/po/tr/fwknopd.po
index 694e5919ecd2ccef00ae213a93f79f18960da4ac..78ad383a02c11e7319364eb8c26a15cb681c4367 100644 (file)
--- a/applications/luci-app-fwknopd/po/tr/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/tr/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/uk/fwknopd.po b/applications/luci-app-fwknopd/po/uk/fwknopd.po
index 792db18acc49edf9d6f17b0ad4a95f9054ee8fc4..61f602aeee0c1c08ad5da26ac3d3e37e018038da 100644 (file)
--- a/applications/luci-app-fwknopd/po/uk/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/uk/fwknopd.po
@@ -22,7 +22,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -75,8 +75,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -92,7 +92,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/vi/fwknopd.po b/applications/luci-app-fwknopd/po/vi/fwknopd.po
index 961d371f58a959fe5a0d86031adaf2ff92c1e202..e4430621471927b5539ef325f54a9bce62e15d6a 100644 (file)
--- a/applications/luci-app-fwknopd/po/vi/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/vi/fwknopd.po
@@ -21,7 +21,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -91,7 +91,7 @@ msgid "The base64 hmac key"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/zh-cn/fwknopd.po b/applications/luci-app-fwknopd/po/zh-cn/fwknopd.po
index 3134aa11af3ce0a50742f4e51cc456a722990797..15cb72645b37b8d19a5356b5aacedd1dce7152c2 100644 (file)
--- a/applications/luci-app-fwknopd/po/zh-cn/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/zh-cn/fwknopd.po
@@ -22,7 +22,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr "允许 SPA 客户端用 DNS 名称请求转发目标。"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr "Base64 密钥"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -84,8 +84,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr "SPA 数据包的最大可接受年龄（秒）。默认为 120 秒"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -101,7 +101,7 @@ msgid "The base64 hmac key"
 msgstr "base64 hmac 密钥"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr "对任何源 IP 使用 ANY"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/po/zh-tw/fwknopd.po b/applications/luci-app-fwknopd/po/zh-tw/fwknopd.po
index 7cb0f42feaee1ab5f6b63762f62b4cc86e4070f0..f758e5e81f707643f8a029265a8c3d306fa3d78a 100644 (file)
--- a/applications/luci-app-fwknopd/po/zh-tw/fwknopd.po
+++ b/applications/luci-app-fwknopd/po/zh-tw/fwknopd.po
@@ -22,7 +22,7 @@ msgid "Allow SPA clients to request forwarding destination by DNS name."
 msgstr "允許 SPA 客戶端用 DNS 名稱請求轉發目標。"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:22
-msgid "Base 64 key"
+msgid "Base64 key"
 msgstr "Base64 金鑰"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:33
@@ -84,8 +84,8 @@ msgstr ""
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:46
 msgid ""
-"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
-"seconds"
+"Maximum age in seconds that an SPA packet will be accepted. Defaults to 120 "
+"seconds."
 msgstr "SPA 資料包的最大可接受年齡（秒）。預設為 120 秒"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:19
@@ -101,7 +101,7 @@ msgid "The base64 hmac key"
 msgstr "base64 hmac 金鑰"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:17
-msgid "Use ANY for any source ip"
+msgid "Use ANY for any source IP"
 msgstr "對任何源 IP 使用 ANY"
 
 #: applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua:8

diff --git a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd
index 9e5057e701a2d350726a7711c8b4e96df71706a7..f81c941e83aee00da2d8183e5bfe4f0d180c9f4b 100644 (file)
--- a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd
+++ b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd
@@ -4,16 +4,11 @@
 . /lib/functions/network.sh
 
 [ "$(uci -q get fwknopd.@access[0].KEY)" != "CHANGEME" ] && exit 0
-uci batch <<EOF
-       add ucitrack fwknopd
-       set ucitrack.@fwknopd[-1].init=fwknopd
-       commit ucitrack
-EOF
 
 uci delete fwknopd.@access[0].KEY
 uci delete fwknopd.@access[0].HMAC_KEY
-uci set fwknopd.@access[0].keytype='Base 64 key'
-uci set fwknopd.@access[0].hkeytype='Base 64 key'
+uci set fwknopd.@access[0].keytype='Base64 key'
+uci set fwknopd.@access[0].hkeytype='Base64 key'
 uci set fwknopd.@access[0].KEY_BASE64=`fwknopd --key-gen | awk '/^KEY/ {print $2;}'`
 uci set fwknopd.@access[0].HMAC_KEY_BASE64=`fwknopd --key-gen | awk '/^HMAC/ {print $2;}'`
 uci set fwknopd.@config[0].ENABLE_IPT_FORWARDING='y'

diff --git a/applications/luci-app-hd-idle/root/etc/uci-defaults/40_luci-hd_idle b/applications/luci-app-hd-idle/root/etc/uci-defaults/40_luci-hd_idle
index 92f435636749303011b3928195deeb1da382aee4..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100755 (executable)
--- a/applications/luci-app-hd-idle/root/etc/uci-defaults/40_luci-hd_idle
+++ b/applications/luci-app-hd-idle/root/etc/uci-defaults/40_luci-hd_idle
@@ -1,11 +1,4 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@hd-idle[-1]
-       add ucitrack hd-idle
-       set ucitrack.@hd-idle[-1].init=hd-idle
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-https-dns-proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile
new file mode 100644 (file)
index 0000000..47e8971
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/Makefile
@@ -0,0 +1,17 @@
+# Copyright 2017-2018 Stan Grishin (stangri@melmac.net)
+# This is free software, licensed under the GNU General Public License v3.
+
+include $(TOPDIR)/rules.mk
+
+PKG_LICENSE:=GPL-3.0-or-later
+PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
+
+LUCI_TITLE:=DNS Over HTTPS Proxy Web UI
+LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy
+LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +https-dns-proxy
+LUCI_PKGARCH:=all
+PKG_RELEASE:=1
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature

diff --git a/applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua b/applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua
new file mode 100644 (file)
index 0000000..d236fea
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua
@@ -0,0 +1,25 @@
+module("luci.controller.https-dns-proxy", package.seeall)
+function index()
+       if nixio.fs.access("/etc/config/https-dns-proxy") then
+               entry({"admin", "services", "https-dns-proxy"}, cbi("https-dns-proxy"), _("DNS Over HTTPS Proxy"))
+               entry({"admin", "services", "https-dns-proxy", "action"}, call("https_dns_proxy_action"), nil).leaf = true
+       end
+end
+
+function https_dns_proxy_action(name)
+       local packageName = "https-dns-proxy"
+       if name == "start" then
+               luci.sys.init.start(packageName)
+       elseif name == "action" then
+               luci.util.exec("/etc/init.d/" .. packageName .. " reload >/dev/null 2>&1")
+               luci.util.exec("/etc/init.d/dnsmasq restart >/dev/null 2>&1")
+       elseif name == "stop" then
+               luci.sys.init.stop(packageName)
+       elseif name == "enable" then
+               luci.sys.init.enable(packageName)
+       elseif name == "disable" then
+               luci.sys.init.disable(packageName)
+       end
+       luci.http.prepare_content("text/plain")
+       luci.http.write("0")
+end

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua
new file mode 100644 (file)
index 0000000..fc19043
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua
@@ -0,0 +1,6 @@
+return {
+       name = "Digitale-Gesellschaft",
+       label = _("Digitale Gesellschaft"),
+       resolver_url = "https://dns.digitale-gesellschaft.ch/dns-query",
+       bootstrap_dns = "185.95.218.42,185.95.218.43"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua
new file mode 100644 (file)
index 0000000..86c4c56
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua
@@ -0,0 +1,6 @@
+return {
+       name = "rubyfish.cn",
+       label = _("rubyfish.cn"),
+       resolver_url = "https://dns.rubyfish.cn/dns-query",
+       bootstrap_dns = "118.89.110.78,47.96.179.163"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua
new file mode 100644 (file)
index 0000000..114d23e
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua
@@ -0,0 +1,6 @@
+return {
+       name = "DNS.SB",
+       label = _("DNS.SB"),
+       resolver_url = "https://doh.dns.sb/dns-query",
+       bootstrap_dns = "185.222.222.222,185.184.222.222"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua
new file mode 100644 (file)
index 0000000..5fb6df3
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua
@@ -0,0 +1,6 @@
+return {
+       name = "AdGuard-Family",
+       label = _("AdGuard (Family Protection)"),
+       resolver_url = "https://dns-family.adguard.com/dns-query",
+       bootstrap_dns = "176.103.130.132,176.103.130.134"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua
new file mode 100644 (file)
index 0000000..950f203
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua
@@ -0,0 +1,6 @@
+return {
+       name = "AdGuard-Standard",
+       label = _("AdGuard (Standard)"),
+       resolver_url = "https://dns.adguard.com/dns-query",
+       bootstrap_dns = "176.103.130.130,176.103.130.131"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua
new file mode 100644 (file)
index 0000000..e8673d5
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua
@@ -0,0 +1,6 @@
+return {
+       name = "Cloudflare",
+       label = _("Cloudflare"),
+       resolver_url = "https://cloudflare-dns.com/dns-query",
+       bootstrap_dns = "1.1.1.1,1.0.0.1"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua
new file mode 100644 (file)
index 0000000..3dfe309
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua
@@ -0,0 +1,6 @@
+return {
+       name = "odvr-nic-cz",
+       label = _("ODVR (nic.cz)"),
+       resolver_url = "https://odvr.nic.cz/doh",
+       bootstrap_dns = "193.17.47.1,185.43.135.1"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua
new file mode 100644 (file)
index 0000000..6eab040
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua
@@ -0,0 +1,7 @@
+return {
+       name = "Google",
+       label = _("Google"),
+       resolver_url = "https://dns.google/dns-query",
+       bootstrap_dns = "8.8.8.8,8.8.4.4",
+       default = true
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua
new file mode 100644 (file)
index 0000000..89becb1
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua
@@ -0,0 +1,6 @@
+return {
+       name = "Quad9-Recommended",
+       label = _("Quad 9 (Recommended)"),
+       resolver_url = "https://dns.quad9.net/dns-query",
+       bootstrap_dns = "9.9.9.9,149.112.112.112"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua
new file mode 100644 (file)
index 0000000..67c24fa
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua
@@ -0,0 +1,6 @@
+return {
+       name = "Quad9-Unsecured",
+       label = _("Quad 9 (Unsecured)"),
+       resolver_url = "https://dns10.quad9.net/dns-query",
+       bootstrap_dns = "9.9.9.10,149.112.112.10"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua
new file mode 100644 (file)
index 0000000..e367794
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua
@@ -0,0 +1,6 @@
+return {
+       name = "Quad9-ECS",
+       label = _("Quad 9 (Secured with ECS Support)"),
+       resolver_url = "https://dns11.quad9.net/dns-query",
+       bootstrap_dns = "9.9.9.11,149.112.112.11"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua
new file mode 100644 (file)
index 0000000..e459f29
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua
@@ -0,0 +1,6 @@
+return {
+       name = "Quad9-Secured",
+       label = _("Quad 9 (Secured)"),
+       resolver_url = "https://dns9.quad9.net/dns-query",
+       bootstrap_dns = "9.9.9.9,149.112.112.9"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua
new file mode 100644 (file)
index 0000000..e816379
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua
@@ -0,0 +1,6 @@
+return {
+       name = "CleanBrowsing-Adult",
+       label = _("CleanBrowsing (Adult Filter)"),
+       resolver_url = "https://doh.cleanbrowsing.org/doh/adult-filter/",
+       bootstrap_dns = "185.228.168.168"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua
new file mode 100644 (file)
index 0000000..9fabda1
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua
@@ -0,0 +1,6 @@
+return {
+       name = "CleanBrowsing-Family",
+       label = _("CleanBrowsing (Family Filter)"),
+       resolver_url = "https://doh.cleanbrowsing.org/doh/family-filter/",
+       bootstrap_dns = "185.228.168.168"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua
new file mode 100644 (file)
index 0000000..0bf11f5
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua
@@ -0,0 +1,6 @@
+return {
+       name = "CleanBrowsing-Security",
+       label = _("CleanBrowsing (Security Filter)"),
+       resolver_url = "https://doh.cleanbrowsing.org/doh/security-filter/",
+       bootstrap_dns = "185.228.168.168"
+}

diff --git a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua
new file mode 100644 (file)
index 0000000..11eca60
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua
@@ -0,0 +1,149 @@
+local sys = require "luci.sys"
+local util = require "luci.util"
+local fs = require "nixio.fs"
+local dispatcher = require "luci.dispatcher"
+local i18n = require "luci.i18n"
+local uci = require("luci.model.uci").cursor()
+
+local packageName = "https-dns-proxy"
+local providers_dir = "/usr/lib/lua/luci/" .. packageName .. "/providers/"
+
+function get_provider_name(value)
+       for filename in fs.dir(providers_dir) do
+               local p_func = loadfile(providers_dir .. filename)
+               setfenv(p_func, { _ = i18n.translate })
+               local p = p_func()
+               value = value:gsub('[%p%c%s]', '')
+               p.url_match = p.resolver_url:gsub('[%p%c%s]', '')
+               if value:match(p.url_match) then
+                       return p.label
+               end
+       end
+       return translate("Unknown Provider")
+end
+
+local tmpfsStatus, tmpfsStatusCode
+local ubusStatus = util.ubus("service", "list", { name = packageName })
+local tmpfsVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'")))
+
+if not tmpfsVersion or tmpfsVersion == "" then
+       tmpfsStatusCode = -1
+       tmpfsVersion = ""
+       tmpfsStatus = packageName .. " " .. translate("is not installed or not found")
+else  
+       tmpfsVersion = " [" .. packageName .. " " .. tmpfsVersion .. "]"
+       if not ubusStatus or not ubusStatus[packageName] then
+               tmpfsStatusCode = 0
+               tmpfsStatus = translate("Stopped")
+       else
+               tmpfsStatusCode, tmpfsStatus = 1, ""
+               for n = 1,1000 do
+                       if ubusStatus and ubusStatus[packageName] and 
+                                ubusStatus[packageName]["instances"] and 
+                                ubusStatus[packageName]["instances"]["instance" .. n] and 
+                                ubusStatus[packageName]["instances"]["instance" .. n]["running"] then
+                               local value, k, v, url, url_flag, la, la_flag, lp, lp_flag
+                               for k, v in pairs(ubusStatus[packageName]["instances"]["instance" .. n]["command"]) do
+                                       if la_flag then la, la_flag = v, false end
+                                       if lp_flag then lp, lp_flag = v, false end
+                                       if url_flag then url, url_flag = v, false end
+                                       if v == "-a" then la_flag = true end
+                                       if v == "-p" then lp_flag = true end
+                                       if v == "-r" then url_flag = true end
+                               end
+                               la = la or "127.0.0.1"
+                               lp = lp or n + 5053
+                               tmpfsStatus = tmpfsStatus .. translate("Running") .. ": " .. get_provider_name(url) .. " " .. translate("DoH") .. " " .. translate("at") .. " " .. la .. ":" .. lp .. "\n"
+                       else
+                               break
+                       end
+               end
+       end
+end
+
+m = Map("https-dns-proxy", translate("DNS Over HTTPS Proxy Settings"))
+
+h = m:section(TypedSection, "_dummy", translate("Service Status") .. tmpfsVersion)
+h.template = "cbi/nullsection"
+ss = h:option(DummyValue, "_dummy", translate("Service Status"))
+if tmpfsStatusCode == -1 then
+       ss.template = packageName .. "/status"
+       ss.value = tmpfsStatus
+else
+               if tmpfsStatusCode == 0 then
+                       ss.template = packageName .. "/status"
+               else
+                       ss.template = packageName .. "/status-textarea"
+               end
+       ss.value = tmpfsStatus
+       buttons = h:option(DummyValue, "_dummy")
+       buttons.template = packageName .. "/buttons"
+end
+
+s3 = m:section(TypedSection, "https-dns-proxy", translate("Instances"), translate("When you add/remove any instances below, they will be used to override the 'DNS forwardings' section of ")
+               .. [[ <a href="]] .. dispatcher.build_url("admin/network/dhcp") .. [[">]]
+               .. translate("DHCP and DNS") .. [[</a>]] .. "."
+    .. "<br />"
+    .. translate("For more information on different options check ")
+               .. [[ <a href="https://adguard.com/en/adguard-dns/overview.html">]]
+    .. "AdGuard.com" .. [[</a>]] .. ", "
+               .. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
+    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
+               .. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
+    .. "Quad9.net" .. [[</a>]] .. ".")
+s3.template = "cbi/tblsection"
+s3.sortable  = false
+s3.anonymous = true
+s3.addremove = true
+
+prov = s3:option(ListValue, "resolver_url", translate("Resolver"))
+for filename in fs.dir(providers_dir) do
+       local p_func = loadfile(providers_dir .. filename)
+       setfenv(p_func, { _ = i18n.translate })
+       local p = p_func()
+       prov:value(p.resolver_url, p.label)
+       if p.default then
+               prov.default = p.resolver_url
+       end
+end
+prov.forcewrite = true
+prov.write = function(self, section, value)
+       if not value then return end
+       for filename in fs.dir(providers_dir) do
+               local p_func = loadfile(providers_dir .. filename)
+               setfenv(p_func, { _ = i18n.translate })
+               local p = p_func()
+               value = value:gsub('[%p%c%s]', '')
+               p.url_match = p.resolver_url:gsub('[%p%c%s]', '')
+               if value:match(p.url_match) then
+                       uci:set(packageName, section, "bootstrap_dns", p.bootstrap_dns)
+                       uci:set(packageName, section, "resolver_url", p.resolver_url)
+               end
+       end
+       uci:save(packageName)
+end
+
+la = s3:option(Value, "listen_addr", translate("Listen address"))
+la.datatype    = "host"
+la.placeholder = "127.0.0.1"
+la.rmempty     = true
+
+local n = 0
+uci:foreach(packageName, packageName, function(s)
+               if s[".name"] == section then
+                               return false
+               end
+               n = n + 1
+end)
+
+lp = s3:option(Value, "listen_port", translate("Listen port"))
+lp.datatype = "port"
+lp.value    = n + 5053
+
+sa = s3:option(Value, "edns_subnet", translate("EDNS client subnet"))
+sa.rmempty  = true
+
+ps = s3:option(Value, "proxy_server", translate("Proxy server"))
+ps.rmempty  = true
+
+return m

diff --git a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm
new file mode 100644 (file)
index 0000000..52d2b50
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm
@@ -0,0 +1,56 @@
+<%#
+       Copyright 2019 Stan Grishin <stangri@melmac.net>
+-%>
+
+<%-
+       local packageName = "https-dns-proxy"
+       local enabledFlag = luci.sys.init.enabled(packageName)
+       local ubusStatus = luci.util.ubus("service", "list", { name = packageName })
+
+       if not ubusStatus or not ubusStatus[packageName] then
+               tmpfsStatusCode = 0
+       else
+               tmpfsStatusCode = 1
+       end
+
+       if tmpfsStatusCode == 0 then
+               btn_start_style = "cbi-button cbi-button-apply important"
+               btn_action_style = "cbi-button cbi-button-apply important"
+               btn_stop_style = "cbi-button cbi-button-reset -disabled"
+       else
+               btn_start_style = "cbi-button cbi-button-apply -disabled"
+               btn_action_style = "cbi-button cbi-button-apply important"
+               btn_stop_style = "cbi-button cbi-button-reset important"
+       end
+       if not enabledFlag then
+               btn_start_style = "cbi-button cbi-button-apply -disabled"
+               btn_action_style = "cbi-button cbi-button-apply -disabled"
+               btn_enable_style = "cbi-button cbi-button-apply important"
+               btn_disable_style = "cbi-button cbi-button-reset -disabled"
+       else
+               btn_enable_style = "cbi-button cbi-button-apply -disabled"
+               btn_disable_style = "cbi-button cbi-button-reset important"
+       end
+-%>
+
+<%+https-dns-proxy/css%>
+<%+https-dns-proxy/js%>
+
+<div class="cbi-value"><label class="cbi-value-title">Service Control</label>
+       <div class="cbi-value-field">
+               <input type="button" class="<%=btn_start_style%>" id="btn_start" name="start" value="<%:Start%>" onclick="button_action(this)" />
+               <span id="btn_start_spinner" class="btn_spinner"></span>
+               <input type="button" class="<%=btn_action_style%>" id="btn_action" name="action" value="<%:Reload%>" onclick="button_action(this)" />
+               <span id="btn_action_spinner" class="btn_spinner"></span>
+               <input type="button" class="<%=btn_stop_style%>" id="btn_stop" name="stop" value="<%:Stop%>" onclick="button_action(this)"  />
+               <span id="btn_stop_spinner" class="btn_spinner"></span>
+               &nbsp;
+               &nbsp;
+               &nbsp;
+               &nbsp;
+               <input type="button" class="<%=btn_enable_style%>" id="btn_enable" name="enable" value="<%:Enable%>" onclick="button_action(this)"  />
+               <span id="btn_enable_spinner" class="btn_spinner"></span>
+               <input type="button" class="<%=btn_disable_style%>" id="btn_disable" name="disable" value="<%:Disable%>" onclick="button_action(this)"  />
+               <span id="btn_disable_spinner" class="btn_spinner"></span>
+       </div>
+</div>

diff --git a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/css.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/css.htm
new file mode 100644 (file)
index 0000000..6fb3d51
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/css.htm
@@ -0,0 +1,9 @@
+<style type="text/css">
+       .btn_spinner
+       {
+               display: inline-block;
+               width: 0px;
+               height: 16px;
+               margin: 0 0px;
+       }
+</style>

diff --git a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm
new file mode 100644 (file)
index 0000000..fac92a3
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm
@@ -0,0 +1,60 @@
+
+<script type="text/javascript">
+//<![CDATA[
+ function button_action(action) {
+       var xhr = new XHR(false);
+       var btn_start = document.getElementById("btn_start");
+       var btn_action = document.getElementById("btn_action");
+       var btn_stop = document.getElementById("btn_stop");
+       var btn_enable = document.getElementById("btn_enable");
+       var btn_disable = document.getElementById("btn_disable");
+       var btn_spinner;
+       switch (action.name) {
+               case "start":
+                       btn_spinner = document.getElementById("btn_start_spinner");
+                       break;
+               case "action":
+                       btn_spinner = document.getElementById("btn_action_spinner");
+                       break;
+               case "stop":
+                       btn_spinner = document.getElementById("btn_stop_spinner");
+                       break;
+               case "enable":
+                       btn_spinner = document.getElementById("btn_enable_spinner");
+                       break;
+               case "disable":
+                       btn_spinner = document.getElementById("btn_disable_spinner");
+                       break;
+       }
+       btn_start.disabled = true;
+       btn_action.disabled = true;
+       btn_stop.disabled = true;
+       btn_enable.disabled = true;
+       btn_disable.disabled = true;
+       spinner(btn_spinner, 1);
+       xhr.get('<%=luci.dispatcher.build_url("admin", "services", "https-dns-proxy", "action")%>/' + action.name, null,
+               function (x) {
+                       if (!x) {
+                               return;
+                       }
+                       btn_start.disabled = false;
+                       btn_action.disabled = false;
+                       btn_stop.disabled = false;
+                       btn_enable.disabled = false;
+                       btn_disable.disabled = false;
+                       spinner(btn_spinner, 0);
+                       location.reload();
+                });
+}
+function spinner(element, state) {
+       if (state === 1) {
+               element.style.width = "16px";
+               element.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" width="16" height="16" style="vertical-align:middle" />';
+       }
+       else {
+               element.style.width = "0px";
+               element.innerHTML = '';
+       }
+}
+//]]>
+</script>

diff --git a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status-textarea.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status-textarea.htm
new file mode 100644 (file)
index 0000000..3840cd1
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status-textarea.htm
@@ -0,0 +1,13 @@
+<%#
+Copyright 2017-2019 Stan Grishin (stangri@melmac.net)
+This is free software, licensed under the Apache License, Version 2.0
+-%>
+
+<%+cbi/valueheader%>
+
+<textarea rows="<%=select(2, self:cfgvalue(section):gsub('\n', ''))%>"
+       style="border:none;box-shadow:none;background:transparent;font-weight:bold;line-height:20px;width:50em;padding:none;margin:6px;resize:none;overflow:hidden;"
+       disabled="disabled"><%=self:cfgvalue(section)%>
+</textarea>
+
+<%+cbi/valuefooter%>

diff --git a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status.htm
new file mode 100644 (file)
index 0000000..c453428
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status.htm
@@ -0,0 +1,10 @@
+<%#
+Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
+This is free software, licensed under the Apache License, Version 2.0
+-%>
+
+<%+cbi/valueheader%>
+
+<input name="status" id="status" type="text" class="cbi-input-text" style="outline:none;border:none;box-shadow:none;background:transparent;font-weight:bold;line-height:30px;height:30px;width:50em;" value="<%=self:cfgvalue(section)%>" disabled="disabled" />
+
+<%+cbi/valuefooter%>

diff --git a/applications/luci-app-https-dns-proxy/po/bg/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/bg/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..9187f34
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/bg/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: bg\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/ca/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/ca/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..dbdb2ea
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/ca/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: ca\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/cs/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/cs/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..0cc66bb
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/cs/https-dns-proxy.po
@@ -0,0 +1,188 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2019-12-05 17:07+0000\n"
+"Last-Translator: Jiri Tersel <jiri.tersel@seznam.cz>\n"
+"Language-Team: Czech <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationshttps_dns_proxy/cs/>\n"
+"Language: cs\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"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-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr "DHCP a DNS"
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr "Více informací o dalších možnostech"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr "Instance"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr "Naslouchající adresa"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr "Naslouchající port"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr "Proxy server"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+"Pokud níže přidáte nebo odeberete instance, budou použity k přepsání sekce "
+"'DNS forwardings' v"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr "a"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "Provider"
+#~ msgstr "Poskytovatel"
+
+#~ msgid "Subnet address"
+#~ msgstr "Adresa podsítě"
+
+#~ msgid "HTTPS DNS Proxy"
+#~ msgstr "HTTPS DNS Proxy"
+
+#~ msgid "HTTPS DNS Proxy Settings"
+#~ msgstr "Nastavení HTTPS DNS Proxy"

diff --git a/applications/luci-app-https-dns-proxy/po/de/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/de/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..1c4230d
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/de/https-dns-proxy.po
@@ -0,0 +1,197 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2019-12-12 15:06+0000\n"
+"Last-Translator: ssantos <ssantos@web.de>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationshttps_dns_proxy/de/>\n"
+"Language: de\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.10-dev\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr "AdGuard (Familienschutz)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr "AdGuard (Standard)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr "CleanBrowsing (Familienfilter)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr "CleanBrowsing (Familienfilter)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr "CleanBrowsing (Sicherheitsfilter)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr "Cloudflare"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr "DHCP und DNS"
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr "DNS.SB"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr "Digitale Gesellschaft"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr "Deaktivieren"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr "DoH"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr "Aktivieren"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr "Weitere Informationen zu den verschiedenen Optionen finden Sie unter"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr "Google"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr "Instanzen"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr "Listen-Adresse"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr "Listen-Port"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr "Lade"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr "ODVR (nic.cz)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr "Proxyserver"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr "Quad 9 (empfohlen)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr "Quad 9 (gesichert mit ECS-Unterstützung)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr "Quad 9 (gesichert)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr "Quad 9 (ungesichert)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr "Neu laden"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr "Laufend"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr "Dienststatus"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr "Start"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr "Stoppen"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr "Angehalten"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+"Wenn Sie untenstehende Instanzen hinzufügen/entfernen, werden sie für den "
+"Abschnitt 'DNS-Weiterleitungen' verwendet von"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr "und"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr "bei"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr "ist nicht installiert oder nicht gefunden"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "DNS over HTTPS Proxy"
+#~ msgstr "DNS über HTTPS Proxy"
+
+#~ msgid "DNS over HTTPS Proxy Settings"
+#~ msgstr "DNS über HTTPS Proxy-Einstellungen"
+
+#~ msgid "Provider"
+#~ msgstr "Anbieter"
+
+#~ msgid "Subnet address"
+#~ msgstr "Subnetzadresse"
+
+#~ msgid "Uknown Provider"
+#~ msgstr "Bekannter Anbieter"
+
+#~ msgid "HTTPS DNS Proxy"
+#~ msgstr "HTTPS-DNS-Proxy"
+
+#~ msgid "HTTPS DNS Proxy Settings"
+#~ msgstr "HTTPS-DNS-Proxyeinstellungen"

diff --git a/applications/luci-app-https-dns-proxy/po/el/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/el/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..2a8198c
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/el/https-dns-proxy.po
@@ -0,0 +1,174 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2019-12-03 08:25+0000\n"
+"Last-Translator: Tavaninja <metalcorpe@gmail.com>\n"
+"Language-Team: Greek <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationshttps_dns_proxy/el/>\n"
+"Language: el\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.10-dev\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr "Φόρτωση"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/en/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/en/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..9dc2beb
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/en/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: en\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/es/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/es/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..4adb321
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/es/https-dns-proxy.po
@@ -0,0 +1,206 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2019-12-10 23:15+0000\n"
+"Last-Translator: JuanE SF <juanesf91@gmail.com>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationshttps_dns_proxy/es/>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.10-dev\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr "AdGuard (Protección familiar)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr "AdGuard (estándar)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr "CleanBrowsing (Filtro para adultos)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr "CleanBrowsing (Filtro familiar)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr "CleanBrowsing (Filtro de seguridad)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr "Cloudflare"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr "DHCP y DNS"
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr "DNS.SB"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr "Sociedad digital"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr "Desactivar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr "DoH"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr "Activar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr "Para obtener más información sobre diferentes opciones, consulte"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr "Google"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr "Instancias"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr "Escuchar dirección"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr "Puerto"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr "Cargando"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr "ODVR (nic.cz)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr "Servidor proxy"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr "Quad 9 (recomendado)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr "Quad 9 (Asegurado con soporte ECS)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr "Quad 9 (Asegurado)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr "Quad 9 (No asegurado)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr "Recargar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr "Corriendo"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr "Estado del servicio"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr "Iniciar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr "Detener"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr "Detenido"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+"Cuando agregue/elimine las instancias a continuación, se utilizarán para "
+"anular la sección 'Reenvíos DNS' de"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr "y"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr "a"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr "no está instalado o no se encuentra"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "DNS over HTTPS Proxy"
+#~ msgstr "DNS sobre proxy HTTPS"
+
+#~ msgid "DNS over HTTPS Proxy Settings"
+#~ msgstr "Configuración de DNS sobre proxy HTTPS"
+
+#~ msgid "Provider"
+#~ msgstr "Proveedor"
+
+#~ msgid "Subnet address"
+#~ msgstr "Direccion de subred"
+
+#~ msgid "Uknown Provider"
+#~ msgstr "Proveedor Desconocido"
+
+#~ msgid "HTTPS DNS Proxy"
+#~ msgstr "Proxy DNS HTTPS"
+
+#~ msgid "HTTPS DNS Proxy Settings"
+#~ msgstr "Configuración de proxy HTTPS DNS"
+
+#~ msgid "Group name"
+#~ msgstr "Nombre del grupo"
+
+#~ msgid "User name"
+#~ msgstr "Nombre de usuario"

diff --git a/applications/luci-app-https-dns-proxy/po/fr/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/fr/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..bc26fbd
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/fr/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: fr\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/he/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/he/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..3b445c8
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/he/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: he\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/hi/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/hi/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..49b6f01
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/hi/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: hi\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/hu/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/hu/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..160d6da
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/hu/https-dns-proxy.po
@@ -0,0 +1,174 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2019-12-10 23:15+0000\n"
+"Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
+"Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationshttps_dns_proxy/hu/>\n"
+"Language: hu\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.10-dev\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr "DHCP és DNS"
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr "Letiltás"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr "Engedélyezés"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr "Betöltés"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr "Újratöltés"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr "Indítás"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr "Leállítás"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/it/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/it/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..bf84a19
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/it/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: it\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/ja/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/ja/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..a3aa6bc
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/ja/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: ja\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/ko/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/ko/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..5a42245
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/ko/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: ko\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/mr/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/mr/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..cfec04e
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/mr/https-dns-proxy.po
@@ -0,0 +1,174 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2019-12-15 21:23+0000\n"
+"Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
+"Language-Team: Marathi <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationshttps_dns_proxy/mr/>\n"
+"Language: mr\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.10-dev\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr "लोड करीत आहे"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/ms/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/ms/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..26b756b
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/ms/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: ms\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/nb_NO/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/nb_NO/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..63734bc
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/nb_NO/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: nb_NO\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/pl/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/pl/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..9c4d863
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/pl/https-dns-proxy.po
@@ -0,0 +1,198 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2019-12-13 23:07+0000\n"
+"Last-Translator: Michal L <michalrmsmi@wp.pl>\n"
+"Language-Team: Polish <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationshttps_dns_proxy/pl/>\n"
+"Language: pl\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 3.10-dev\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr "AdGuard (Ochrona rodziny)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr "AdGuard (Standardowy)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr "CleanBrowsing (Filtr treści dla dorosłych)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr "CleanBrowsing (Filtr rodzinny)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr "CleanBrowsing (Filtr bezpieczeństwa)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr "Cloudflare"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr "DHCP i DNS"
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr "DNS.SB"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr "Digitale Gesellschaft"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr "Wyłącz"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr "DoH"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr "Włącz"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr "Więcej informacji na temat wyboru różnych opcji"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr "Google"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr "Instancje"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr "Nasłuchiwany adres"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr "Nasłuchiwany port"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr "Ładowanie"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr "ODVR (nic.cz)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr "Serwer Proxy"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr "Quad 9 (Zalecane)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr "Quad 9 (Zabezpieczony z obsługą ECS)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr "Quad 9 (Zabezpieczony)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr "Quad 9 (Niezabezpieczony)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr "Przeładuj"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr "Uruchomione"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr "Status usługi"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr "Uruchom"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr "Stop"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr "Zatrzymany"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+"Po dodaniu/usunięciu dowolnej instancji poniżej, zastąpią one ustawienia "
+"sekcji 'Przekierowania DNS' w"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr "i"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr "na"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr "nie jest zainstalowany lub nie został znaleziony"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "DNS over HTTPS Proxy"
+#~ msgstr "Proxy DNS over HTTPS"
+
+#~ msgid "DNS over HTTPS Proxy Settings"
+#~ msgstr "Ustawiania proxy DNS over HTTPS"
+
+#~ msgid "Provider"
+#~ msgstr "Dostawca"
+
+#~ msgid "Subnet address"
+#~ msgstr "Adres podsieci"
+
+#~ msgid "Uknown Provider"
+#~ msgstr "Nieznany dostawca"
+
+#~ msgid "HTTPS DNS Proxy"
+#~ msgstr "HTTPS DNS Proxy"
+
+#~ msgid "HTTPS DNS Proxy Settings"
+#~ msgstr "Ustawienia Proxy HTTPS DNS"

diff --git a/applications/luci-app-https-dns-proxy/po/pt/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/pt/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..11fb4ed
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/pt/https-dns-proxy.po
@@ -0,0 +1,197 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2019-12-05 17:07+0000\n"
+"Last-Translator: ssantos <ssantos@web.de>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationshttps_dns_proxy/pt/>\n"
+"Language: pt\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.10-dev\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr "AdGuard (Proteção da Família)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr "AdGuard (Padrão)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr "CleanBrowsing (Filtro Adulto)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr "CleanBrowsing (Filtro para a Familia)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr "CleanBrowsing (Filtro de Segurança)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr "Cloudflare"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr "DHCP e DNS"
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr "DNS.SB"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr "Digitale Gesellschaft"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr "Desativar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr "DoH"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr "Ativar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr "Para obter mais informações sobre opções diferentes, verifique"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr "Google"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr "Instâncias"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr "Endereço de escuta"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr "Porta de escuta"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr "A carregar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr "ODVR (nic.cz)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr "Servidor proxy"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr "Quad 9 (Recomendado)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr "Quad 9 (Protegido com Suporte de ECS)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr "Quad 9 (Seguro)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr "Quad 9 (Sem Segurança)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr "Recarregar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr "Executando"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr "Estado do Serviço"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr "Iniciar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr "Parar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr "Parado"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+"Quando adicionar/remover quaisquer instâncias abaixo, serão usadas para "
+"substituir a seção 'DNS forwardings' de"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr "e"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr "em"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr "não está instalado ou não foi encontrado"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "DNS over HTTPS Proxy"
+#~ msgstr "Proxy de DNS sobre HTTPS"
+
+#~ msgid "DNS over HTTPS Proxy Settings"
+#~ msgstr "Configurações de Proxy DNS sobre HTTPS"
+
+#~ msgid "Provider"
+#~ msgstr "Provedor"
+
+#~ msgid "Subnet address"
+#~ msgstr "Endereço de sub-rede"
+
+#~ msgid "Uknown Provider"
+#~ msgstr "Provedor Desconhecido"
+
+#~ msgid "HTTPS DNS Proxy"
+#~ msgstr "Proxy de DNS HTTPS"
+
+#~ msgid "HTTPS DNS Proxy Settings"
+#~ msgstr "Configurações de proxy HTTPS DNS"

diff --git a/applications/luci-app-https-dns-proxy/po/pt_BR/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/pt_BR/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..a49b0f5
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/pt_BR/https-dns-proxy.po
@@ -0,0 +1,191 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2019-12-03 08:25+0000\n"
+"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
+"openwrt/luciapplicationshttps_dns_proxy/pt_BR/>\n"
+"Language: pt_BR\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.10-dev\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr "AdGuard (Proteção Familiar)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr "AdGuard (Padrão)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr "CleanBrowsing (Filtro Adulto)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr "CleanBrowsing (Filtro Familiar)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr "CleanBrowsing (Filtro de Segurança)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr "Cloudflare"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr "DHCP e DNS"
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr "DNS.SB"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr "Digitale Gesellschaft"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr "Desativar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr "DoH"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr "Ativar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr "Para obter mais informações sobre diferentes opções, verifique"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr "Google"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr "Instâncias"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr "Escutar endereço"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr "Porta de escuta"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr "Carregando"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr "ODVR (nic.cz)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr "Servidor proxy"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr "Quad 9 (Preferível)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr "Quad 9 (Protegido com Suporte a ECS)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr "Quad 9 (Seguro)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr "Quad 9 (Sem Segurança)"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr "Recarregar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr "Em execução"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr "Condição do Serviço"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr "Iniciar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr "Parar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr "Parado"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+"Quando você adiciona/remove quaisquer instâncias abaixo, elas serão usadas "
+"para substituir a seção 'Encaminhamentos DNS' de"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr "e"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr "em"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr "não está instalado ou não foi encontrado"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "DNS over HTTPS Proxy"
+#~ msgstr "DNS sobre Proxy HTTPS"
+
+#~ msgid "DNS over HTTPS Proxy Settings"
+#~ msgstr "Configurações de DNS sobre Proxy HTTPS"
+
+#~ msgid "Provider"
+#~ msgstr "Provedor"
+
+#~ msgid "Subnet address"
+#~ msgstr "Endereço de sub-rede"
+
+#~ msgid "Uknown Provider"
+#~ msgstr "Provedor Desconhecido"

diff --git a/applications/luci-app-https-dns-proxy/po/ro/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/ro/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..e567be4
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/ro/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: ro\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/ru/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/ru/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..1b9e752
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/ru/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: ru\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/sk/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/sk/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..1288d3f
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/sk/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: sk\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/sv/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/sv/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..88edf26
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/sv/https-dns-proxy.po
@@ -0,0 +1,174 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2019-12-03 08:25+0000\n"
+"Last-Translator: Mattias Münster <mattiasmun@gmail.com>\n"
+"Language-Team: Swedish <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationshttps_dns_proxy/sv/>\n"
+"Language: sv\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.10-dev\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr "DHCP och DNS"
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr "Inaktivera"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr "Aktivera"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr "Lyssningsadress"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr "Lyssningsport"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr "Laddar"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr "Ladda om"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr "Starta"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr "Stoppad"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot
new file mode 100644 (file)
index 0000000..3e1ddb2
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot
@@ -0,0 +1,165 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/tr/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/tr/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..aa8333e
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/tr/https-dns-proxy.po
@@ -0,0 +1,174 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2019-12-09 20:04+0000\n"
+"Last-Translator: İsmail Karslı <ismail541236@gmail.com>\n"
+"Language-Team: Turkish <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationshttps_dns_proxy/tr/>\n"
+"Language: tr\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.10-dev\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr "Durdur"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/uk/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/uk/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..412c97a
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/uk/https-dns-proxy.po
@@ -0,0 +1,175 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2019-12-15 21:23+0000\n"
+"Last-Translator: Yurii Petrashko <yuripet@gmail.com>\n"
+"Language-Team: Ukrainian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationshttps_dns_proxy/uk/>\n"
+"Language: uk\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 3.10-dev\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr "DHCP та DNS"
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr "Увімкнути"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr "Завантаження"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr "Запустити"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr "Зупинити"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/vi/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/vi/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..918e17c
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/vi/https-dns-proxy.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Language: vi\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""

diff --git a/applications/luci-app-https-dns-proxy/po/zh-cn/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/zh-cn/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..6d527d6
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/zh-cn/https-dns-proxy.po
@@ -0,0 +1,207 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2019-12-04 12:07+0000\n"
+"Last-Translator: lissom <kkjoy2617@gmail.com>\n"
+"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
+"openwrt/luciapplicationshttps_dns_proxy/zh_Hans/>\n"
+"Language: zh-cn\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.10-dev\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr "AdGuard（家庭保护）"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr "AdGuard（标准）"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr "CleanBrowsing（成人过滤器）"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr "CleanBrowsing（家庭过滤器）"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr "CleanBrowsing（安全筛选器）"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr "Cloudflare"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr "DHCP/DNS"
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr "DNS.SB"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr "Digitale Gesellschaft"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr "禁用"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr "DoH"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr "启用"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr "有关不同选项的更多信息，请检查"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr "谷歌"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr "实例"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr "监听地址"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr "监听端口"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr "加载中"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr "ODVR （nic.cz）"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr "代理服务器"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr "Quad 9（推荐）"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr "Quad 9（获得ECS支持）"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr "Quad 9（安全）"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr "Quad 9（不安全）"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr "重新载入"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr "运行中"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr "服务状态"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr "启动"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr "停止"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr "已停止"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr "当您添加/删除下面的任何实例时，它们将用于覆盖以下实例的“ DNS转发”部分"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr "和"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr "在"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr "未安装或未找到"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "DNS over HTTPS Proxy"
+#~ msgstr "DNS over HTTPS 代理"
+
+#~ msgid "DNS over HTTPS Proxy Settings"
+#~ msgstr "DNS over HTTPS代理设置"
+
+#~ msgid "Provider"
+#~ msgstr "提供商"
+
+#~ msgid "Subnet address"
+#~ msgstr "子网地址"
+
+#~ msgid "Uknown Provider"
+#~ msgstr "未知提供商"
+
+#~ msgid "HTTPS DNS Proxy"
+#~ msgstr "HTTPS DNS 代理"
+
+#~ msgid "HTTPS DNS Proxy Settings"
+#~ msgstr "HTTPS DNS 代理设置"
+
+#~ msgid "Group name"
+#~ msgstr "组名称"
+
+#~ msgid "User name"
+#~ msgstr "用户名"

diff --git a/applications/luci-app-https-dns-proxy/po/zh-tw/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/zh-tw/https-dns-proxy.po
new file mode 100644 (file)
index 0000000..7484b8f
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/po/zh-tw/https-dns-proxy.po
@@ -0,0 +1,197 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2019.
+#
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2019-01-03 22:46+0800\n"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"X-Generator: Gtranslator 3.30.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+msgid "AdGuard (Family Protection)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+msgid "AdGuard (Standard)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+msgid "CleanBrowsing (Adult Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+msgid "CleanBrowsing (Family Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+msgid "CleanBrowsing (Security Filter)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+msgid "Cloudflare"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+msgid "DHCP and DNS"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+msgid "DNS.SB"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+msgid "Digitale Gesellschaft"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+msgid "Disable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "DoH"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+msgid "For more information on different options check"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+msgid "Google"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid "Instances"
+msgstr "例項"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+msgid "Listen address"
+msgstr "監聽位址"
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+msgid "Listen port"
+msgstr "監聽埠"
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+msgid "ODVR (nic.cz)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+msgid "Proxy server"
+msgstr "代理伺服器"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+msgid "Quad 9 (Recommended)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+msgid "Quad 9 (Secured with ECS Support)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+msgid "Quad 9 (Secured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+msgid "Quad 9 (Unsecured)"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+msgid "Reload"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "Running"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+msgid "Start"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+msgid "Stop"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+msgid "Stopped"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+msgid ""
+"When you add/remove any instances below, they will be used to override the "
+"'DNS forwardings' section of"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+msgid "and"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+msgid "at"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+msgid "is not installed or not found"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "Provider"
+#~ msgstr "提供商"
+
+#~ msgid "Subnet address"
+#~ msgstr "子網位址"
+
+#~ msgid "HTTPS DNS Proxy"
+#~ msgstr "HTTPS DNS 代理"
+
+#~ msgid "HTTPS DNS Proxy Settings"
+#~ msgstr "HTTPS DNS 代理設定"
+
+#~ msgid "Group name"
+#~ msgstr "組名稱"
+
+#~ msgid "User name"
+#~ msgstr "使用者名稱"

diff --git a/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy b/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy
new file mode 100644 (file)
index 0000000..a1ecfce
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
+exit 0

diff --git a/applications/luci-app-https_dns_proxy/Makefile b/applications/luci-app-https_dns_proxy/Makefile
deleted file mode 100644 (file)
index bd6cf9b..0000000
--- a/applications/luci-app-https_dns_proxy/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2017-2018 Stan Grishin (stangri@melmac.net)
-# This is free software, licensed under the GNU General Public License v3.
-
-include $(TOPDIR)/rules.mk
-
-PKG_LICENSE:=GPL-3.0-or-later
-PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
-
-LUCI_TITLE:=HTTPS DNS Proxy Web UI
-LUCI_DESCRIPTION:=Provides Web UI for HTTPS DNS Proxy
-LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +https_dns_proxy
-LUCI_PKGARCH:=all
-PKG_RELEASE:=9
-
-include ../../luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature

diff --git a/applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua b/applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua
deleted file mode 100644 (file)
index 826f3f6..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-module("luci.controller.https_dns_proxy", package.seeall)
-function index()
-       if nixio.fs.access("/etc/config/https_dns_proxy") then
-               entry({"admin", "services", "https_dns_proxy"}, cbi("https_dns_proxy"), _("DNS over HTTPS Proxy"))
-               entry({"admin", "services", "https_dns_proxy", "action"}, call("https_dns_proxy_action"), nil).leaf = true
-       end
-end
-
-function https_dns_proxy_action(name)
-       local packageName = "https_dns_proxy"
-       if name == "start" then
-               luci.sys.init.start(packageName)
-       elseif name == "action" then
-               luci.util.exec("/etc/init.d/" .. packageName .. " reload >/dev/null 2>&1")
-               luci.util.exec("/etc/init.d/dnsmasq restart >/dev/null 2>&1")
-       elseif name == "stop" then
-               luci.sys.init.stop(packageName)
-       elseif name == "enable" then
-               luci.sys.init.enable(packageName)
-       elseif name == "disable" then
-               luci.sys.init.disable(packageName)
-       end
-       luci.http.prepare_content("text/plain")
-       luci.http.write("0")
-end

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua
deleted file mode 100644 (file)
index 723ca89..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-       name = "Digitale-Gesellschaft",
-       label = _("Digitale Gesellschaft"),
-       url_prefix = "https://dns.digitale-gesellschaft.ch/dns-query?",
-       bootstrap_dns = "185.95.218.42,185.95.218.43"
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua
deleted file mode 100644 (file)
index 050549b..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---             .. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---             .. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---             .. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-       name = "AdGuard-Family",
-       label = _("AdGuard (Family Protection)"),
-       url_prefix = "https://dns-family.adguard.com/dns-query?ct&",
-       bootstrap_dns = "176.103.130.132,176.103.130.134"
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua
deleted file mode 100644 (file)
index 67b7c12..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---             .. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---             .. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---             .. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-       name = "AdGuard-Standard",
-       label = _("AdGuard (Standard)"),
-       url_prefix = "https://dns.adguard.com/dns-query?ct&",
-       bootstrap_dns = "176.103.130.130,176.103.130.131"
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua
deleted file mode 100644 (file)
index e47576b..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-       name = "odvr-nic-cz",
-       label = _("ODVR (nic.cz)"),
-       url_prefix = "https://odvr.nic.cz/doh?",
-       bootstrap_dns = "193.17.47.1,185.43.135.1"
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua
deleted file mode 100644 (file)
index 356921a..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---             .. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---             .. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---             .. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-       name = "Quad9-Recommended",
-       label = _("Quad 9 (Recommended)"),
-       url_prefix = "https://dns.quad9.net:5053/dns-query?",
-       bootstrap_dns = "9.9.9.9,149.112.112.112"
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua
deleted file mode 100644 (file)
index a031556..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---             .. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---             .. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---             .. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-       name = "Quad9-Unsecured",
-       label = _("Quad 9 (Unsecured)"),
-       url_prefix = "https://dns10.quad9.net:5053/dns-query?",
-       bootstrap_dns = "9.9.9.10,149.112.112.10"
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua
deleted file mode 100644 (file)
index 3b51978..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---             .. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---             .. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---             .. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-       name = "Quad9-ECS",
-       label = _("Quad 9 (Secured with ECS Support)"),
-       url_prefix = "https://dns11.quad9.net:5053/dns-query?",
-       bootstrap_dns = "9.9.9.11,149.112.112.11"
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua
deleted file mode 100644 (file)
index c456a8d..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---             .. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---             .. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---             .. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-       name = "Quad9-Secured",
-       label = _("Quad 9 (Secured)"),
-       url_prefix = "https://dns9.quad9.net:5053/dns-query?",
-       bootstrap_dns = "9.9.9.9,149.112.112.9"
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua
deleted file mode 100644 (file)
index 708a39e..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---             .. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---             .. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---             .. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-       name = "CleanBrowsing-Adult",
-       label = _("CleanBrowsing (Adult Filter)"),
-       url_prefix = "https://doh.cleanbrowsing.org/doh/adult-filter/?ct&",
-       bootstrap_dns = "185.228.168.168"
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua
deleted file mode 100644 (file)
index f44ed43..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---             .. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---             .. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---             .. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-       name = "CleanBrowsing-Family",
-       label = _("CleanBrowsing (Family Filter)"),
-       url_prefix = "https://doh.cleanbrowsing.org/doh/family-filter/?ct&",
-       bootstrap_dns = "185.228.168.168"
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua
deleted file mode 100644 (file)
index e4a3bf4..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua
+++ /dev/null
@@ -1,14 +0,0 @@
---    .. "</br>"
---    .. translate("For more information on different options check ")
---             .. [[ <a href="https://adguard.com/en/adguard-dns/overview.html#instruction">]]
---    .. "AdGuard.com" .. [[</a>]] .. ", "
---             .. [[ <a href="https://cleanbrowsing.org/guides/dnsoverhttps">]]
---    .. "CleanBrowsing.org" .. [[</a>]] .. " " .. translate("and") .. " "
---             .. [[ <a href="https://www.quad9.net/doh-quad9-dns-servers/">]]
---    .. "Quad9.net" .. [[</a>]] .. "."
-return {
-       name = "CleanBrowsing-Security",
-       label = _("CleanBrowsing (Security Filter)"),
-       url_prefix = "https://doh.cleanbrowsing.org/doh/security-filter/?ct&",
-       bootstrap_dns = "185.228.168.168"
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua
deleted file mode 100644 (file)
index 74d9273..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-       name = "Cloudflare",
-       label = _("Cloudflare"),
-       url_prefix = "https://cloudflare-dns.com/dns-query?ct=application/dns-json&",
-       bootstrap_dns = "1.1.1.1,1.0.0.1"
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua
deleted file mode 100644 (file)
index 168f3f7..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-return {
-       name = "Google",
-       label = _("Google"),
-       url_prefix = "https://dns.google.com/resolve?",
-       bootstrap_dns = "8.8.8.8,8.8.4.4",
-       default = true
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua b/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua
deleted file mode 100644 (file)
index 50dc742..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-       name = "DNS.SB",
-       label = _("DNS.SB"),
-       url_prefix = "https://doh.dns.sb/dns-query?",
-       bootstrap_dns = "185.222.222.222,185.184.222.222"
-}

diff --git a/applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua b/applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua
deleted file mode 100644 (file)
index 4e7e025..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua
+++ /dev/null
@@ -1,143 +0,0 @@
-local sys = require "luci.sys"
-local util = require "luci.util"
-local fs = require "nixio.fs"
-local dispatcher = require "luci.dispatcher"
-local i18n = require "luci.i18n"
-local uci = require("luci.model.uci").cursor()
-
-local packageName = "https_dns_proxy"
-local providers_dir = "/usr/lib/lua/luci/" .. packageName .. "/providers/"
-
-function get_provider_name(value)
-       for filename in fs.dir(providers_dir) do
-               local p_func = loadfile(providers_dir .. filename)
-               setfenv(p_func, { _ = i18n.translate })
-               local p = p_func()
-               value = value:gsub('[%p%c%s]', '')
-               p.url_match = p.url_prefix:gsub('[%p%c%s]', '')
-               if value:match(p.url_match) then
-                       return p.label
-               end
-       end
-       return translate("Uknown Provider")
-end
-
-local tmpfsStatus, tmpfsStatusCode
-local ubusStatus = util.ubus("service", "list", { name = packageName })
-local tmpfsVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'")))
-
-if not tmpfsVersion or tmpfsVersion == "" then
-       tmpfsStatusCode = -1
-       tmpfsVersion = ""
-       tmpfsStatus = packageName .. " " .. translate("is not installed or not found")
-else  
-       tmpfsVersion = " [" .. packageName .. " " .. tmpfsVersion .. "]"
-       if not ubusStatus or not ubusStatus[packageName] then
-               tmpfsStatusCode = 0
-               tmpfsStatus = translate("Stopped")
-       else
-               tmpfsStatusCode, tmpfsStatus = 1, ""
-               for n = 1,1000 do
-                       if ubusStatus and ubusStatus[packageName] and 
-                                ubusStatus[packageName]["instances"] and 
-                                ubusStatus[packageName]["instances"]["instance" .. n] and 
-                                ubusStatus[packageName]["instances"]["instance" .. n]["running"] then
-                               local value, k, v, url, url_flag, la, la_flag, lp, lp_flag
-                               for k, v in pairs(ubusStatus[packageName]["instances"]["instance" .. n]["command"]) do
-                                       if la_flag then la, la_flag = v, false end
-                                       if lp_flag then lp, lp_flag = v, false end
-                                       if url_flag then url, url_flag = v, false end
-                                       if v == "-a" then la_flag = true end
-                                       if v == "-p" then lp_flag = true end
-                                       if v == "-r" then url_flag = true end
-                               end
-                               la = la or "127.0.0.1"
-                               lp = lp or n + 5053
-                               tmpfsStatus = tmpfsStatus .. translate("Running") .. ": " .. get_provider_name(url) .. " " .. translate("DoH") .. " " .. translate("at") .. " " .. la .. ":" .. lp .. "\n"
-                       else
-                               break
-                       end
-               end
-       end
-end
-
-m = Map("https_dns_proxy", translate("DNS over HTTPS Proxy Settings"))
-
-h = m:section(TypedSection, "_dummy", translate("Service Status") .. tmpfsVersion)
-h.template = "cbi/nullsection"
-ss = h:option(DummyValue, "_dummy", translate("Service Status"))
-if tmpfsStatusCode == -1 then
-       ss.template = packageName .. "/status"
-       ss.value = tmpfsStatus
-else
-               if tmpfsStatusCode == 0 then
-                       ss.template = packageName .. "/status"
-               else
-                       ss.template = packageName .. "/status-textarea"
-               end
-       ss.value = tmpfsStatus
-       buttons = h:option(DummyValue, "_dummy")
-       buttons.template = packageName .. "/buttons"
-end
-
-s3 = m:section(TypedSection, "https_dns_proxy", translate("Instances"), translate("When you add/remove any instances below, they will be used to override the 'DNS forwardings' section of ")
-               .. [[ <a href="]] .. dispatcher.build_url("admin/network/dhcp") .. [[">]]
-               .. translate("DHCP and DNS") .. [[</a>]] .. ".")
-s3.template = "cbi/tblsection"
-s3.sortable  = false
-s3.anonymous = true
-s3.addremove = true
-
-prov = s3:option(ListValue, "url_prefix", translate("Provider"))
-for filename in fs.dir(providers_dir) do
-       local p_func = loadfile(providers_dir .. filename)
-       setfenv(p_func, { _ = i18n.translate })
-       local p = p_func()
-       prov:value(p.url_prefix, p.label)
-       if p.default then
-               prov.default = p.url_prefix
-       end
-end
-prov.forcewrite = true
-prov.write = function(self, section, value)
-       if not value then return end
-       for filename in fs.dir(providers_dir) do
-               local p_func = loadfile(providers_dir .. filename)
-               setfenv(p_func, { _ = i18n.translate })
-               local p = p_func()
-               value = value:gsub('[%p%c%s]', '')
-               p.url_match = p.url_prefix:gsub('[%p%c%s]', '')
-               if value:match(p.url_match) then
-                       uci:set("https_dns_proxy", section, "bootstrap_dns", p.bootstrap_dns)
-                       uci:set("https_dns_proxy", section, "url_prefix", p.url_prefix)
-               end
-       end
-       uci:save("https_dns_proxy")
-end
-
-la = s3:option(Value, "listen_addr", translate("Listen address"))
-la.datatype    = "host"
-la.placeholder = "127.0.0.1"
-la.rmempty     = true
-
-local n = 0
-uci:foreach("https_dns_proxy", "https_dns_proxy", function(s)
-               if s[".name"] == section then
-                               return false
-               end
-               n = n + 1
-end)
-
-lp = s3:option(Value, "listen_port", translate("Listen port"))
-lp.datatype = "port"
-lp.value    = n + 5053
-
-sa = s3:option(Value, "subnet_addr", translate("Subnet address"))
-sa.datatype = "host"
-sa.rmempty  = true
-
-ps = s3:option(Value, "proxy_server", translate("Proxy server"))
-ps.datatype = "host"
-ps.rmempty  = true
-
-return m

diff --git a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm b/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm
deleted file mode 100644 (file)
index 84c5f60..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<%#
-       Copyright 2019 Stan Grishin <stangri@melmac.net>
--%>
-
-<%-
-       local packageName = "https_dns_proxy"
-       local enabledFlag = luci.sys.init.enabled(packageName)
-       local ubusStatus = luci.util.ubus("service", "list", { name = packageName })
-
-       if not ubusStatus or not ubusStatus[packageName] then
-               tmpfsStatusCode = 0
-       else
-               tmpfsStatusCode = 1
-       end
-
-       if tmpfsStatusCode == 0 then
-               btn_start_style = "cbi-button cbi-button-apply important"
-               btn_action_style = "cbi-button cbi-button-apply important"
-               btn_stop_style = "cbi-button cbi-button-reset -disabled"
-       else
-               btn_start_style = "cbi-button cbi-button-apply -disabled"
-               btn_action_style = "cbi-button cbi-button-apply important"
-               btn_stop_style = "cbi-button cbi-button-reset important"
-       end
-       if not enabledFlag then
-               btn_start_style = "cbi-button cbi-button-apply -disabled"
-               btn_action_style = "cbi-button cbi-button-apply -disabled"
-               btn_enable_style = "cbi-button cbi-button-apply important"
-               btn_disable_style = "cbi-button cbi-button-reset -disabled"
-       else
-               btn_enable_style = "cbi-button cbi-button-apply -disabled"
-               btn_disable_style = "cbi-button cbi-button-reset important"
-       end
--%>
-
-<%+https_dns_proxy/css%>
-<%+https_dns_proxy/js%>
-
-<div class="cbi-value"><label class="cbi-value-title">Service Control</label>
-       <div class="cbi-value-field">
-               <input type="button" class="<%=btn_start_style%>" id="btn_start" name="start" value="<%:Start%>" onclick="button_action(this)" />
-               <span id="btn_start_spinner" class="btn_spinner"></span>
-               <input type="button" class="<%=btn_action_style%>" id="btn_action" name="action" value="<%:Reload%>" onclick="button_action(this)" />
-               <span id="btn_action_spinner" class="btn_spinner"></span>
-               <input type="button" class="<%=btn_stop_style%>" id="btn_stop" name="stop" value="<%:Stop%>" onclick="button_action(this)"  />
-               <span id="btn_stop_spinner" class="btn_spinner"></span>
-               &nbsp;
-               &nbsp;
-               &nbsp;
-               &nbsp;
-               <input type="button" class="<%=btn_enable_style%>" id="btn_enable" name="enable" value="<%:Enable%>" onclick="button_action(this)"  />
-               <span id="btn_enable_spinner" class="btn_spinner"></span>
-               <input type="button" class="<%=btn_disable_style%>" id="btn_disable" name="disable" value="<%:Disable%>" onclick="button_action(this)"  />
-               <span id="btn_disable_spinner" class="btn_spinner"></span>
-       </div>
-</div>

diff --git a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/css.htm b/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/css.htm
deleted file mode 100644 (file)
index 6fb3d51..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/css.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<style type="text/css">
-       .btn_spinner
-       {
-               display: inline-block;
-               width: 0px;
-               height: 16px;
-               margin: 0 0px;
-       }
-</style>

diff --git a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm b/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm
deleted file mode 100644 (file)
index 3b0daaa..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm
+++ /dev/null
@@ -1,60 +0,0 @@
-
-<script type="text/javascript">
-//<![CDATA[
- function button_action(action) {
-       var xhr = new XHR(false);
-       var btn_start = document.getElementById("btn_start");
-       var btn_action = document.getElementById("btn_action");
-       var btn_stop = document.getElementById("btn_stop");
-       var btn_enable = document.getElementById("btn_enable");
-       var btn_disable = document.getElementById("btn_disable");
-       var btn_spinner;
-       switch (action.name) {
-               case "start":
-                       btn_spinner = document.getElementById("btn_start_spinner");
-                       break;
-               case "action":
-                       btn_spinner = document.getElementById("btn_action_spinner");
-                       break;
-               case "stop":
-                       btn_spinner = document.getElementById("btn_stop_spinner");
-                       break;
-               case "enable":
-                       btn_spinner = document.getElementById("btn_enable_spinner");
-                       break;
-               case "disable":
-                       btn_spinner = document.getElementById("btn_disable_spinner");
-                       break;
-       }
-       btn_start.disabled = true;
-       btn_action.disabled = true;
-       btn_stop.disabled = true;
-       btn_enable.disabled = true;
-       btn_disable.disabled = true;
-       spinner(btn_spinner, 1);
-       xhr.get('<%=luci.dispatcher.build_url("admin", "services", "https_dns_proxy", "action")%>/' + action.name, null,
-               function (x) {
-                       if (!x) {
-                               return;
-                       }
-                       btn_start.disabled = false;
-                       btn_action.disabled = false;
-                       btn_stop.disabled = false;
-                       btn_enable.disabled = false;
-                       btn_disable.disabled = false;
-                       spinner(btn_spinner, 0);
-                       location.reload();
-                });
-}
-function spinner(element, state) {
-       if (state === 1) {
-               element.style.width = "16px";
-               element.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" width="16" height="16" style="vertical-align:middle" />';
-       }
-       else {
-               element.style.width = "0px";
-               element.innerHTML = '';
-       }
-}
-//]]>
-</script>

diff --git a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/status-textarea.htm b/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/status-textarea.htm
deleted file mode 100644 (file)
index 3840cd1..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/status-textarea.htm
+++ /dev/null
@@ -1,13 +0,0 @@
-<%#
-Copyright 2017-2019 Stan Grishin (stangri@melmac.net)
-This is free software, licensed under the Apache License, Version 2.0
--%>
-
-<%+cbi/valueheader%>
-
-<textarea rows="<%=select(2, self:cfgvalue(section):gsub('\n', ''))%>"
-       style="border:none;box-shadow:none;background:transparent;font-weight:bold;line-height:20px;width:50em;padding:none;margin:6px;resize:none;overflow:hidden;"
-       disabled="disabled"><%=self:cfgvalue(section)%>
-</textarea>
-
-<%+cbi/valuefooter%>

diff --git a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/status.htm b/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/status.htm
deleted file mode 100644 (file)
index c453428..0000000
--- a/applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/status.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<%#
-Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
-This is free software, licensed under the Apache License, Version 2.0
--%>
-
-<%+cbi/valueheader%>
-
-<input name="status" id="status" type="text" class="cbi-input-text" style="outline:none;border:none;box-shadow:none;background:transparent;font-weight:bold;line-height:30px;height:30px;width:50em;" value="<%=self:cfgvalue(section)%>" disabled="disabled" />
-
-<%+cbi/valuefooter%>

diff --git a/applications/luci-app-https_dns_proxy/po/bg/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/bg/https_dns_proxy.po
deleted file mode 100644 (file)
index 6418382..0000000
--- a/applications/luci-app-https_dns_proxy/po/bg/https_dns_proxy.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Language: bg\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/ca/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/ca/https_dns_proxy.po
deleted file mode 100644 (file)
index 0c05a65..0000000
--- a/applications/luci-app-https_dns_proxy/po/ca/https_dns_proxy.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Language: ca\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/cs/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/cs/https_dns_proxy.po
deleted file mode 100644 (file)
index 77e98ed..0000000
--- a/applications/luci-app-https_dns_proxy/po/cs/https_dns_proxy.po
+++ /dev/null
@@ -1,194 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2019-12-05 17:07+0000\n"
-"Last-Translator: Jiri Tersel <jiri.tersel@seznam.cz>\n"
-"Language-Team: Czech <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/cs/>\n"
-"Language: cs\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"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-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr "DHCP a DNS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr "Více informací o dalších možnostech"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr "Instance"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr "Naslouchající adresa"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr "Naslouchající port"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "Poskytovatel"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr "Proxy server"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "Adresa podsítě"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-"Pokud níže přidáte nebo odeberete instance, budou použity k přepsání sekce "
-"'DNS forwardings' v"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr "a"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""
-
-#~ msgid "HTTPS DNS Proxy"
-#~ msgstr "HTTPS DNS Proxy"
-
-#~ msgid "HTTPS DNS Proxy Settings"
-#~ msgstr "Nastavení HTTPS DNS Proxy"

diff --git a/applications/luci-app-https_dns_proxy/po/de/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/de/https_dns_proxy.po
deleted file mode 100644 (file)
index ca014fc..0000000
--- a/applications/luci-app-https_dns_proxy/po/de/https_dns_proxy.po
+++ /dev/null
@@ -1,194 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2019-12-12 15:06+0000\n"
-"Last-Translator: ssantos <ssantos@web.de>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/de/>\n"
-"Language: de\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr "AdGuard (Familienschutz)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr "AdGuard (Standard)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr "CleanBrowsing (Familienfilter)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr "CleanBrowsing (Familienfilter)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr "CleanBrowsing (Sicherheitsfilter)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr "Cloudflare"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr "DHCP und DNS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr "DNS über HTTPS Proxy"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr "DNS über HTTPS Proxy-Einstellungen"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr "DNS.SB"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr "Digitale Gesellschaft"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr "Deaktivieren"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr "DoH"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr "Aktivieren"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr "Weitere Informationen zu den verschiedenen Optionen finden Sie unter"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr "Google"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr "Instanzen"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr "Listen-Adresse"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr "Listen-Port"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr "Lade"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr "ODVR (nic.cz)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "Anbieter"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr "Proxyserver"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr "Quad 9 (empfohlen)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr "Quad 9 (gesichert mit ECS-Unterstützung)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr "Quad 9 (gesichert)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr "Quad 9 (ungesichert)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr "Neu laden"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr "Laufend"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr "Dienststatus"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr "Start"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr "Stoppen"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr "Angehalten"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "Subnetzadresse"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr "Bekannter Anbieter"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-"Wenn Sie untenstehende Instanzen hinzufügen/entfernen, werden sie für den "
-"Abschnitt 'DNS-Weiterleitungen' verwendet von"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr "und"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr "bei"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr "ist nicht installiert oder nicht gefunden"
-
-#~ msgid "HTTPS DNS Proxy"
-#~ msgstr "HTTPS-DNS-Proxy"
-
-#~ msgid "HTTPS DNS Proxy Settings"
-#~ msgstr "HTTPS-DNS-Proxyeinstellungen"

diff --git a/applications/luci-app-https_dns_proxy/po/el/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/el/https_dns_proxy.po
deleted file mode 100644 (file)
index a72984b..0000000
--- a/applications/luci-app-https_dns_proxy/po/el/https_dns_proxy.po
+++ /dev/null
@@ -1,186 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2019-12-03 08:25+0000\n"
-"Last-Translator: Tavaninja <metalcorpe@gmail.com>\n"
-"Language-Team: Greek <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/el/>\n"
-"Language: el\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr "Φόρτωση"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/en/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/en/https_dns_proxy.po
deleted file mode 100644 (file)
index ab7bd6e..0000000
--- a/applications/luci-app-https_dns_proxy/po/en/https_dns_proxy.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Language: en\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/es/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/es/https_dns_proxy.po
deleted file mode 100644 (file)
index 7fd7d2f..0000000
--- a/applications/luci-app-https_dns_proxy/po/es/https_dns_proxy.po
+++ /dev/null
@@ -1,203 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-12-10 23:15+0000\n"
-"Last-Translator: JuanE SF <juanesf91@gmail.com>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/es/>\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr "AdGuard (Protección familiar)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr "AdGuard (estándar)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr "CleanBrowsing (Filtro para adultos)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr "CleanBrowsing (Filtro familiar)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr "CleanBrowsing (Filtro de seguridad)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr "Cloudflare"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr "DHCP y DNS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr "DNS sobre proxy HTTPS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr "Configuración de DNS sobre proxy HTTPS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr "DNS.SB"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr "Sociedad digital"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr "Desactivar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr "DoH"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr "Activar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr "Para obtener más información sobre diferentes opciones, consulte"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr "Google"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr "Instancias"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr "Escuchar dirección"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr "Puerto"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr "Cargando"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr "ODVR (nic.cz)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "Proveedor"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr "Servidor proxy"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr "Quad 9 (recomendado)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr "Quad 9 (Asegurado con soporte ECS)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr "Quad 9 (Asegurado)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr "Quad 9 (No asegurado)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr "Recargar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr "Corriendo"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr "Estado del servicio"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr "Iniciar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr "Detener"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr "Detenido"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "Direccion de subred"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr "Proveedor Desconocido"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-"Cuando agregue/elimine las instancias a continuación, se utilizarán para "
-"anular la sección 'Reenvíos DNS' de"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr "y"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr "a"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr "no está instalado o no se encuentra"
-
-#~ msgid "HTTPS DNS Proxy"
-#~ msgstr "Proxy DNS HTTPS"
-
-#~ msgid "HTTPS DNS Proxy Settings"
-#~ msgstr "Configuración de proxy HTTPS DNS"
-
-#~ msgid "Group name"
-#~ msgstr "Nombre del grupo"
-
-#~ msgid "User name"
-#~ msgstr "Nombre de usuario"

diff --git a/applications/luci-app-https_dns_proxy/po/fr/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/fr/https_dns_proxy.po
deleted file mode 100644 (file)
index 2b1f37a..0000000
--- a/applications/luci-app-https_dns_proxy/po/fr/https_dns_proxy.po
+++ /dev/null
@@ -1,186 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2019-12-26 18:23+0000\n"
-"Last-Translator: reyur <remicaruyer@gmail.com>\n"
-"Language-Team: French <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/fr/>\n"
-"Language: fr\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.10\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr "Chargement"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/he/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/he/https_dns_proxy.po
deleted file mode 100644 (file)
index 55504b4..0000000
--- a/applications/luci-app-https_dns_proxy/po/he/https_dns_proxy.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Language: he\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/hi/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/hi/https_dns_proxy.po
deleted file mode 100644 (file)
index cd3f3b6..0000000
--- a/applications/luci-app-https_dns_proxy/po/hi/https_dns_proxy.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Language: hi\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/hu/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/hu/https_dns_proxy.po
deleted file mode 100644 (file)
index 0752cfe..0000000
--- a/applications/luci-app-https_dns_proxy/po/hu/https_dns_proxy.po
+++ /dev/null
@@ -1,188 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2019-12-21 21:43+0000\n"
-"Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
-"Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/hu/>\n"
-"Language: hu\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr "AdGuard (családvédelem)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr "AdGuard (szabványos)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr "CleanBrowsing (felnőtt szűrő)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr "CleanBrowsing (családszűrő)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr "CleanBrowsing (biztonsági szűrő)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr "Cloudflare"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr "DHCP és DNS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr "DNS HTTPS-proxy fölött"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr "DNS HTTPS-proxy fölött beállításai"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr "DNS.SB"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr "Digitale Gesellschaft"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr "Letiltás"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr "DoH"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr "Engedélyezés"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr "A különböző beállításokkal kapcsolatos további információkért nézze meg"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr "Google"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr "Példányok"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr "Cím figyelése"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr "Port figyelése"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr "Betöltés"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr "ODVR (nic.cz)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "Szolgáltató"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr "Proxy-kiszolgáló"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr "Quad 9 (ajánlott)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr "Quad 9 (biztonságos ECS támogatással)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr "Quad 9 (biztonságos)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr "Quad 9 (nem biztonságos)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr "Újratöltés"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr "Fut"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr "Szolgáltatás állapota"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr "Indítás"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr "Leállítás"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr "Leállítva"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "Alhálózat címe"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr "Ismeretlen szolgáltató"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-"Ha bármely példányt hozzáadja vagy eltávolítja lent, akkor azok lesznek "
-"használva a „DNS továbbítások” szakaszának felülbírálását ennek:"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr "és"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr "ekkor:"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr "nincs telepítve vagy nem található"

diff --git a/applications/luci-app-https_dns_proxy/po/it/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/it/https_dns_proxy.po
deleted file mode 100644 (file)
index d2786e8..0000000
--- a/applications/luci-app-https_dns_proxy/po/it/https_dns_proxy.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Language: it\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/ja/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/ja/https_dns_proxy.po
deleted file mode 100644 (file)
index 58845a7..0000000
--- a/applications/luci-app-https_dns_proxy/po/ja/https_dns_proxy.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Language: ja\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/ko/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/ko/https_dns_proxy.po
deleted file mode 100644 (file)
index c5b4e75..0000000
--- a/applications/luci-app-https_dns_proxy/po/ko/https_dns_proxy.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Language: ko\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/mr/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/mr/https_dns_proxy.po
deleted file mode 100644 (file)
index 4ec3a15..0000000
--- a/applications/luci-app-https_dns_proxy/po/mr/https_dns_proxy.po
+++ /dev/null
@@ -1,186 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2019-12-16 23:25+0000\n"
-"Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
-"Language-Team: Marathi <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/mr/>\n"
-"Language: mr\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr "सक्षम करा"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr "लोड करीत आहे"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/ms/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/ms/https_dns_proxy.po
deleted file mode 100644 (file)
index 57b41a7..0000000
--- a/applications/luci-app-https_dns_proxy/po/ms/https_dns_proxy.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Language: ms\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/nb_NO/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/nb_NO/https_dns_proxy.po
deleted file mode 100644 (file)
index 5566a8b..0000000
--- a/applications/luci-app-https_dns_proxy/po/nb_NO/https_dns_proxy.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Language: nb_NO\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/pl/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/pl/https_dns_proxy.po
deleted file mode 100644 (file)
index 1b2edc9..0000000
--- a/applications/luci-app-https_dns_proxy/po/pl/https_dns_proxy.po
+++ /dev/null
@@ -1,195 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2019-12-13 23:07+0000\n"
-"Last-Translator: Michal L <michalrmsmi@wp.pl>\n"
-"Language-Team: Polish <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/pl/>\n"
-"Language: pl\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.10-dev\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr "AdGuard (Ochrona rodziny)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr "AdGuard (Standardowy)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr "CleanBrowsing (Filtr treści dla dorosłych)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr "CleanBrowsing (Filtr rodzinny)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr "CleanBrowsing (Filtr bezpieczeństwa)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr "Cloudflare"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr "DHCP i DNS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr "Proxy DNS over HTTPS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr "Ustawiania proxy DNS over HTTPS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr "DNS.SB"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr "Digitale Gesellschaft"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr "Wyłącz"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr "DoH"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr "Włącz"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr "Więcej informacji na temat wyboru różnych opcji"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr "Google"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr "Instancje"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr "Nasłuchiwany adres"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr "Nasłuchiwany port"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr "Ładowanie"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr "ODVR (nic.cz)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "Dostawca"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr "Serwer Proxy"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr "Quad 9 (Zalecane)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr "Quad 9 (Zabezpieczony z obsługą ECS)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr "Quad 9 (Zabezpieczony)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr "Quad 9 (Niezabezpieczony)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr "Przeładuj"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr "Uruchomione"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr "Status usługi"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr "Uruchom"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr "Stop"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr "Zatrzymany"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "Adres podsieci"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr "Nieznany dostawca"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-"Po dodaniu/usunięciu dowolnej instancji poniżej, zastąpią one ustawienia "
-"sekcji 'Przekierowania DNS' w"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr "i"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr "na"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr "nie jest zainstalowany lub nie został znaleziony"
-
-#~ msgid "HTTPS DNS Proxy"
-#~ msgstr "HTTPS DNS Proxy"
-
-#~ msgid "HTTPS DNS Proxy Settings"
-#~ msgstr "Ustawienia Proxy HTTPS DNS"

diff --git a/applications/luci-app-https_dns_proxy/po/pt/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/pt/https_dns_proxy.po
deleted file mode 100644 (file)
index 4684343..0000000
--- a/applications/luci-app-https_dns_proxy/po/pt/https_dns_proxy.po
+++ /dev/null
@@ -1,194 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2019-12-05 17:07+0000\n"
-"Last-Translator: ssantos <ssantos@web.de>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/pt/>\n"
-"Language: pt\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr "AdGuard (Proteção da Família)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr "AdGuard (Padrão)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr "CleanBrowsing (Filtro Adulto)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr "CleanBrowsing (Filtro para a Familia)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr "CleanBrowsing (Filtro de Segurança)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr "Cloudflare"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr "DHCP e DNS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr "Proxy de DNS sobre HTTPS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr "Configurações de Proxy DNS sobre HTTPS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr "DNS.SB"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr "Digitale Gesellschaft"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr "Desativar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr "DoH"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr "Ativar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr "Para obter mais informações sobre opções diferentes, verifique"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr "Google"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr "Instâncias"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr "Endereço de escuta"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr "Porta de escuta"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr "A carregar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr "ODVR (nic.cz)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "Provedor"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr "Servidor proxy"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr "Quad 9 (Recomendado)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr "Quad 9 (Protegido com Suporte de ECS)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr "Quad 9 (Seguro)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr "Quad 9 (Sem Segurança)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr "Recarregar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr "Executando"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr "Estado do Serviço"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr "Iniciar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr "Parar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr "Parado"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "Endereço de sub-rede"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr "Provedor Desconhecido"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-"Quando adicionar/remover quaisquer instâncias abaixo, serão usadas para "
-"substituir a seção 'DNS forwardings' de"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr "e"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr "em"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr "não está instalado ou não foi encontrado"
-
-#~ msgid "HTTPS DNS Proxy"
-#~ msgstr "Proxy de DNS HTTPS"
-
-#~ msgid "HTTPS DNS Proxy Settings"
-#~ msgstr "Configurações de proxy HTTPS DNS"

diff --git a/applications/luci-app-https_dns_proxy/po/pt_BR/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/pt_BR/https_dns_proxy.po
deleted file mode 100644 (file)
index e4ca92f..0000000
--- a/applications/luci-app-https_dns_proxy/po/pt_BR/https_dns_proxy.po
+++ /dev/null
@@ -1,188 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2019-12-03 08:25+0000\n"
-"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
-"openwrt/luciapplicationshttps_dns_proxy/pt_BR/>\n"
-"Language: pt_BR\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr "AdGuard (Proteção Familiar)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr "AdGuard (Padrão)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr "CleanBrowsing (Filtro Adulto)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr "CleanBrowsing (Filtro Familiar)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr "CleanBrowsing (Filtro de Segurança)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr "Cloudflare"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr "DHCP e DNS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr "DNS sobre Proxy HTTPS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr "Configurações de DNS sobre Proxy HTTPS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr "DNS.SB"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr "Digitale Gesellschaft"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr "Desativar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr "DoH"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr "Ativar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr "Para obter mais informações sobre diferentes opções, verifique"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr "Google"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr "Instâncias"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr "Escutar endereço"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr "Porta de escuta"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr "Carregando"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr "ODVR (nic.cz)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "Provedor"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr "Servidor proxy"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr "Quad 9 (Preferível)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr "Quad 9 (Protegido com Suporte a ECS)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr "Quad 9 (Seguro)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr "Quad 9 (Sem Segurança)"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr "Recarregar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr "Em execução"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr "Condição do Serviço"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr "Iniciar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr "Parar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr "Parado"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "Endereço de sub-rede"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr "Provedor Desconhecido"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-"Quando você adiciona/remove quaisquer instâncias abaixo, elas serão usadas "
-"para substituir a seção 'Encaminhamentos DNS' de"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr "e"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr "em"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr "não está instalado ou não foi encontrado"

diff --git a/applications/luci-app-https_dns_proxy/po/ro/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/ro/https_dns_proxy.po
deleted file mode 100644 (file)
index 6fb53c4..0000000
--- a/applications/luci-app-https_dns_proxy/po/ro/https_dns_proxy.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Language: ro\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/ru/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/ru/https_dns_proxy.po
deleted file mode 100644 (file)
index efccb91..0000000
--- a/applications/luci-app-https_dns_proxy/po/ru/https_dns_proxy.po
+++ /dev/null
@@ -1,187 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2019-12-26 18:23+0000\n"
-"Last-Translator: Alex Ky <esthomolupus@gmail.com>\n"
-"Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/ru/>\n"
-"Language: ru\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.10\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr "DHCP и DNS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr "Отключить"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr "Включить"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr "Загружаем"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr "Старт"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr "Остановить"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/sk/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/sk/https_dns_proxy.po
deleted file mode 100644 (file)
index 5798c1c..0000000
--- a/applications/luci-app-https_dns_proxy/po/sk/https_dns_proxy.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Language: sk\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/sv/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/sv/https_dns_proxy.po
deleted file mode 100644 (file)
index 002ae43..0000000
--- a/applications/luci-app-https_dns_proxy/po/sv/https_dns_proxy.po
+++ /dev/null
@@ -1,186 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2019-12-03 08:25+0000\n"
-"Last-Translator: Mattias Münster <mattiasmun@gmail.com>\n"
-"Language-Team: Swedish <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/sv/>\n"
-"Language: sv\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr "DHCP och DNS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr "Inaktivera"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr "Aktivera"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr "Lyssningsadress"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr "Lyssningsport"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr "Laddar"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr "Ladda om"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr "Starta"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr "Stoppad"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot b/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot
deleted file mode 100644 (file)
index 1808cd9..0000000
--- a/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot
+++ /dev/null
@@ -1,177 +0,0 @@
-msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/tr/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/tr/https_dns_proxy.po
deleted file mode 100644 (file)
index c61c6f9..0000000
--- a/applications/luci-app-https_dns_proxy/po/tr/https_dns_proxy.po
+++ /dev/null
@@ -1,186 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2019-12-09 20:04+0000\n"
-"Last-Translator: İsmail Karslı <ismail541236@gmail.com>\n"
-"Language-Team: Turkish <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/tr/>\n"
-"Language: tr\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr "Durdur"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/uk/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/uk/https_dns_proxy.po
deleted file mode 100644 (file)
index 4e4862c..0000000
--- a/applications/luci-app-https_dns_proxy/po/uk/https_dns_proxy.po
+++ /dev/null
@@ -1,187 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2019-12-15 21:23+0000\n"
-"Last-Translator: Yurii Petrashko <yuripet@gmail.com>\n"
-"Language-Team: Ukrainian <https://hosted.weblate.org/projects/openwrt/"
-"luciapplicationshttps_dns_proxy/uk/>\n"
-"Language: uk\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.10-dev\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr "DHCP та DNS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr "Увімкнути"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr "Завантаження"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr "Запустити"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr "Зупинити"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/vi/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/vi/https_dns_proxy.po
deleted file mode 100644 (file)
index 244c5f7..0000000
--- a/applications/luci-app-https_dns_proxy/po/vi/https_dns_proxy.po
+++ /dev/null
@@ -1,180 +0,0 @@
-msgid ""
-msgstr ""
-"Language: vi\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""

diff --git a/applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po
deleted file mode 100644 (file)
index 19da1e0..0000000
--- a/applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po
+++ /dev/null
@@ -1,204 +0,0 @@
-#
-# Yangfl <mmyangfl@gmail.com>, 2019.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-12-04 12:07+0000\n"
-"Last-Translator: lissom <kkjoy2617@gmail.com>\n"
-"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
-"openwrt/luciapplicationshttps_dns_proxy/zh_Hans/>\n"
-"Language: zh-cn\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.10-dev\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr "AdGuard（家庭保护）"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr "AdGuard（标准）"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr "CleanBrowsing（成人过滤器）"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr "CleanBrowsing（家庭过滤器）"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr "CleanBrowsing（安全筛选器）"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr "Cloudflare"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr "DHCP/DNS"
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr "DNS over HTTPS 代理"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr "DNS over HTTPS代理设置"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr "DNS.SB"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr "Digitale Gesellschaft"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr "禁用"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr "DoH"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr "启用"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr "有关不同选项的更多信息，请检查"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr "谷歌"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr "实例"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr "监听地址"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr "监听端口"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr "加载中"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr "ODVR （nic.cz）"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "提供商"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr "代理服务器"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr "Quad 9（推荐）"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr "Quad 9（获得ECS支持）"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr "Quad 9（安全）"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr "Quad 9（不安全）"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr "重新载入"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr "运行中"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr "服务状态"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr "启动"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr "停止"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr "已停止"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "子网地址"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr "未知提供商"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr "当您添加/删除下面的任何实例时，它们将用于覆盖以下实例的“ DNS转发”部分"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr "和"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr "在"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr "未安装或未找到"
-
-#~ msgid "HTTPS DNS Proxy"
-#~ msgstr "HTTPS DNS 代理"
-
-#~ msgid "HTTPS DNS Proxy Settings"
-#~ msgstr "HTTPS DNS 代理设置"
-
-#~ msgid "Group name"
-#~ msgstr "组名称"
-
-#~ msgid "User name"
-#~ msgstr "用户名"

diff --git a/applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po
deleted file mode 100644 (file)
index c4d40fc..0000000
--- a/applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po
+++ /dev/null
@@ -1,203 +0,0 @@
-#
-# Yangfl <mmyangfl@gmail.com>, 2019.
-#
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-01-03 22:46+0800\n"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
-"X-Generator: Gtranslator 3.30.1\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
-msgid "AdGuard (Family Protection)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
-msgid "AdGuard (Standard)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
-msgid "CleanBrowsing (Adult Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
-msgid "CleanBrowsing (Family Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
-msgid "CleanBrowsing (Security Filter)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
-msgid "Cloudflare"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
-msgid "DHCP and DNS"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
-msgid "DNS.SB"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
-msgid "Digitale Gesellschaft"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
-msgid "Disable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "DoH"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
-msgid "For more information on different options check"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
-msgid "Google"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid "Instances"
-msgstr "例項"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
-msgid "Listen address"
-msgstr "監聽位址"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
-msgid "Listen port"
-msgstr "監聽埠"
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
-msgid "Loading"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
-msgid "ODVR (nic.cz)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "提供商"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
-msgid "Proxy server"
-msgstr "代理伺服器"
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
-msgid "Quad 9 (Recommended)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
-msgid "Quad 9 (Secured with ECS Support)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
-msgid "Quad 9 (Secured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
-msgid "Quad 9 (Unsecured)"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
-msgid "Reload"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "Running"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
-msgid "Service Status"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
-msgid "Start"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
-msgid "Stop"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "Stopped"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "子網位址"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
-msgid ""
-"When you add/remove any instances below, they will be used to override the "
-"'DNS forwardings' section of"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
-msgid "and"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
-msgid "at"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
-msgid "is not installed or not found"
-msgstr ""
-
-#~ msgid "HTTPS DNS Proxy"
-#~ msgstr "HTTPS DNS 代理"
-
-#~ msgid "HTTPS DNS Proxy Settings"
-#~ msgstr "HTTPS DNS 代理設定"
-
-#~ msgid "Group name"
-#~ msgstr "組名稱"
-
-#~ msgid "User name"
-#~ msgstr "使用者名稱"

diff --git a/applications/luci-app-https_dns_proxy/root/etc/uci-defaults/40_luci-https_dns_proxy b/applications/luci-app-https_dns_proxy/root/etc/uci-defaults/40_luci-https_dns_proxy
deleted file mode 100644 (file)
index 7800af7..0000000
--- a/applications/luci-app-https_dns_proxy/root/etc/uci-defaults/40_luci-https_dns_proxy
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@https_dns_proxy[-1]
-       add ucitrack https_dns_proxy
-       set ucitrack.@template[-1].init=https_dns_proxy
-       commit ucitrack
-EOF
-
-rm -f /tmp/luci-indexcache
-exit 0

diff --git a/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua b/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua
index fe2faaee5d5ad53f78ca40ddaf61ce185e21f783..86ea302c2f1431ceef5a1b411b6cdde3d7ef768e 100644 (file)
--- a/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua
+++ b/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua
@@ -71,7 +71,7 @@ yuv = s:taboption(this_tab, Flag, "yuv", translate("Enable YUYV format"), transl
 quality = s:taboption(this_tab, Value, "quality", translate("JPEG compression quality"), translate("Set the quality in percent. This setting activates YUYV format, disables MJPEG"))
     quality.datatype = "range(0, 100)"
 
-minimum_size = s:taboption(this_tab, Value, "minimum_size", translate("Drop frames smaller then this limit"),translate("Set the minimum size if the webcam produces small-sized garbage frames. May happen under low light conditions"))
+minimum_size = s:taboption(this_tab, Value, "minimum_size", translate("Drop frames smaller than this limit"),translate("Set the minimum size if the webcam produces small-sized garbage frames. May happen under low light conditions"))
     minimum_size.datatype = "uinteger"
 
 no_dynctrl = s:taboption(this_tab, Flag, "no_dynctrl", translate("Don't initialize dynctrls"), translate("Do not initialize dynctrls of Linux-UVC driver"))
@@ -217,7 +217,7 @@ ringbuffer=s:taboption(this_tab, Value, "ringbuffer", translate("Ring buffer siz
 exceed=s:taboption(this_tab, Value, "exceed", translate("Exceed"), translate("Allow ringbuffer to exceed limit by this amount"))
     exceed.datatype = "uinteger"
 
-command=s:taboption(this_tab, Value, "command", translate("Command to run"), translate("Execute command after saving picture. Mjpg-streamer parse the filename as first parameter to your script."))
+command=s:taboption(this_tab, Value, "command", translate("Command to run"), translate("Execute command after saving picture. Mjpg-streamer parses the filename as first parameter to your script."))
 
 link=s:taboption(this_tab, Value, "link", translate("Link newest picture to fixed file name"), translate("Link the last picture in ringbuffer to fixed named file provided."))
 

diff --git a/applications/luci-app-mjpg-streamer/po/bg/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/bg/mjpg-streamer.po
index 005247dded327ea324d65b42d660ad982e8c85c5..eb34f3670bff80b42fdf8732d8f86525a9a41623 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/bg/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/bg/mjpg-streamer.po
@@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -70,7 +70,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/ca/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ca/mjpg-streamer.po
index fb00a8e01b826097eb3b9d598489f46fcff646c1..e0b8c87351747df8c9ee9f0c33e49c52c725111d 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/ca/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/ca/mjpg-streamer.po
@@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -76,7 +76,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/cs/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/cs/mjpg-streamer.po
index a5102b699ff2c6ea1041f047ab3cac7fe260951b..599ca0d2dce2fe821a3c1a84289abdec44a97411 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/cs/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/cs/mjpg-streamer.po
@@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -76,7 +76,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/de/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/de/mjpg-streamer.po
index 08495643a5d9a49b5892e89206631c01b9225787..35aaa4aab2c9253883164e20be437fc4dbca9032 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/de/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/de/mjpg-streamer.po
@@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls"
 msgstr "Dynctrls nicht initialisieren"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr "Verwerfe Bilder, die kleiner als dieses Limit sind"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -76,7 +76,7 @@ msgstr "Überschreiten"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/el/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/el/mjpg-streamer.po
index e4361a6d60e0e80cf825588df860870e59363422..473559bdac506af99e16accef26c08ebddd23a04 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/el/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/el/mjpg-streamer.po
@@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -70,7 +70,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/en/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/en/mjpg-streamer.po
index 786f9d0cfd660ae6407f6de9d0bb6a82a9dca260..24e4d0b12b9d650b1fc53c8ab2d32cffaa0c1c8a 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/en/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/en/mjpg-streamer.po
@@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -70,7 +70,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po
index 46a321c11977f50f2aebc13385d919ade585ca1c..6fda454c1ec90d69c2eff776981ccc10cc55b7cb 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po
@@ -58,7 +58,7 @@ msgid "Don't initialize dynctrls"
 msgstr "No inicialice dynctrls"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr "Drop frames más pequeños que este límite"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -79,7 +79,7 @@ msgstr "Exceder"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 "Ejecute el comando después de guardar la imagen. Mjpg-streamer analiza el "

diff --git a/applications/luci-app-mjpg-streamer/po/fr/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/fr/mjpg-streamer.po
index c7b0ae06d33afb0c53da268733a60f175103225d..7d6eb5b8670a15b5c403bacfcdb2e6a506d6911b 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/fr/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/fr/mjpg-streamer.po
@@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -76,7 +76,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/he/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/he/mjpg-streamer.po
index ac9c36a84702bb074a1d7e28ac1874b350a73917..739d4b0db2a802d13c31251b1d89c6ff28457fd7 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/he/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/he/mjpg-streamer.po
@@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -70,7 +70,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/hi/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/hi/mjpg-streamer.po
index de726beeee68444bd755990509a291171c676ee2..3f531e0be96a98e6748c658e5d67c5faeb48f146 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/hi/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/hi/mjpg-streamer.po
@@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -70,7 +70,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/hu/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/hu/mjpg-streamer.po
index fb5525e958c3316f4242cf49f643442fed3993b7..d8e43fbf867217fb53492af0aa983a44e53aa055 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/hu/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/hu/mjpg-streamer.po
@@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls"
 msgstr "Ne készítse elő a dynctrls programot"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr "Ennél a korlátnál kisebb képkockák eldobása"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -76,7 +76,7 @@ msgstr "Meghaladás"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 "Parancs végrehajtása a fénykép mentése után. Az MJPG-adatközvetítő a "

diff --git a/applications/luci-app-mjpg-streamer/po/it/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/it/mjpg-streamer.po
index c1c36ac2c838572b11e438a2280543fc43526276..e62d515bb8e738f2dfa455da9a6181a25d2d770c 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/it/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/it/mjpg-streamer.po
@@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -76,7 +76,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po
index d4c45434437f0a2216b5dd3df213986dac403e8f..2f144327b2ada892385b5c90ec54a184a175312b 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po
@@ -56,7 +56,7 @@ msgid "Don't initialize dynctrls"
 msgstr "dynctrlsを初期化しない"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr "この制限よりも小さいフレームをドロップする"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -77,7 +77,7 @@ msgstr "超過"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 "画像保存後にコマンドを実行します。Mjpg-streamerは、ファイル名をスクリプトの最"

diff --git a/applications/luci-app-mjpg-streamer/po/ko/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ko/mjpg-streamer.po
index e54ec194dd679d66856547984891ad21823d9985..2af2abac0aeeb56cd31e6752d7ef01ef0bfb5b78 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/ko/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/ko/mjpg-streamer.po
@@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -70,7 +70,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/mr/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/mr/mjpg-streamer.po
index 014e1c7e074f34bb1f689cb418f998696a85811b..bf635d0d295af4b4324a745f8b8fc2098aaf0f16 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/mr/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/mr/mjpg-streamer.po
@@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -76,7 +76,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/ms/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ms/mjpg-streamer.po
index e2b596d5f7d58dd14d1dee89a069dcd999328152..dcdc6e16968f05966d59230c8800f2eb29f805a5 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/ms/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/ms/mjpg-streamer.po
@@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -70,7 +70,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/nb_NO/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/nb_NO/mjpg-streamer.po
index 3d5bfcd46ff0f762e0092a2c36f6c7c03149c36f..3c35e99fd9a862d6f832d5ed9f22c731fccda081 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/nb_NO/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/nb_NO/mjpg-streamer.po
@@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -76,7 +76,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/pl/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/pl/mjpg-streamer.po
index 6a1860f97ed9cd4623ea5510a051b337d96d2e6d..d09469d9b1f926ca4da680f7e9538779fde314df 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/pl/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/pl/mjpg-streamer.po
@@ -56,7 +56,7 @@ msgid "Don't initialize dynctrls"
 msgstr "Nie ładuj dynamicznych kontroli"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr "Porzucaj klatki mniejsze niż ten limit"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -77,7 +77,7 @@ msgstr "Przekraczać"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 "Wykonaj komendę po wykonaniu zdjęcia. Mjpg-streamer analizuje nazwę pliku "

diff --git a/applications/luci-app-mjpg-streamer/po/pt-br/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/pt-br/mjpg-streamer.po
index 2cfbcedd1721b2fb2da8e457a05141ac3729e69c..6bb36ebef941f3623ab46ae56f741e27ae1d9d74 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/pt-br/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/pt-br/mjpg-streamer.po
@@ -58,7 +58,7 @@ msgid "Don't initialize dynctrls"
 msgstr "Não inicia o dynctrls"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr "Descarte quadros menores que este limite"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -79,7 +79,7 @@ msgstr "Ultrapassado"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 "Execute o comando depois de salvar a imagem. Mjpg-streamer passa o nome do "

diff --git a/applications/luci-app-mjpg-streamer/po/pt/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/pt/mjpg-streamer.po
index 83f0072cfe9146c0a69eec5294df62b907928e55..4800ed76c8d8a612b9d1b759a1ae976bad7cbdf2 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/pt/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/pt/mjpg-streamer.po
@@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls"
 msgstr "Não iniciar o dynctrls"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr "Descarte quadros menores que este limite"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -76,7 +76,7 @@ msgstr "Ultrapassado"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 "Execute o comando depois de gra\\var a imagem. Mjpg-streamer passa o nome do "

diff --git a/applications/luci-app-mjpg-streamer/po/ro/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ro/mjpg-streamer.po
index 20a69eadb9a17f7c8dda5b35462cd6b1c1ecece8..610272c7688daff43398af4419870da93f090211 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/ro/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/ro/mjpg-streamer.po
@@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -70,7 +70,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/ru/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ru/mjpg-streamer.po
index ed3b7f44b7afca2cba714db718f5976518da1b58..b32961545fbd98ceea976da7fb5b7ad20083639f 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/ru/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/ru/mjpg-streamer.po
@@ -61,7 +61,7 @@ msgid "Don't initialize dynctrls"
 msgstr "Отключить dynctrls"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr "Ограничить кол-во кадров"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -82,7 +82,7 @@ msgstr "Превышение"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 "Выполнить команду после сохранения изображения.<br />Mjpg-streamer задаст "

diff --git a/applications/luci-app-mjpg-streamer/po/sk/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/sk/mjpg-streamer.po
index d7d25d532352573612d25366eb9e1321ae494896..91e1c1717dfc5eed024ab3bf26ee9a92e590bba2 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/sk/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/sk/mjpg-streamer.po
@@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -70,7 +70,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/sv/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/sv/mjpg-streamer.po
index ef9eb27b76756820747c598190b14dc240ee2119..ef794f9d611cfc26df204b85ad8dfa7f0cc7b95c 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/sv/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/sv/mjpg-streamer.po
@@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -76,7 +76,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/tr/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/tr/mjpg-streamer.po
index a08ceec6aaed606bc362d691bdb8490eb3bbe418..a46d12280907b08b8ef12ba7c5988b2714667003 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/tr/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/tr/mjpg-streamer.po
@@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -70,7 +70,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/uk/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/uk/mjpg-streamer.po
index 39b2213ffbcd5481bb1e9b6261478ba2832ab8a1..78dd9daa82ad4116fe4f9d836788058f33afa399 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/uk/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/uk/mjpg-streamer.po
@@ -56,7 +56,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -77,7 +77,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/vi/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/vi/mjpg-streamer.po
index 2d036a0b57dc6f76dd0d004fb779314a62628f3d..28cf534d4cfdc43a087ea10aa7667dc050dfb5af 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/vi/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/vi/mjpg-streamer.po
@@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -70,7 +70,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr ""
 

diff --git a/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po
index 34c56d5fcff12e6643040029c01afb078510a25c..2e6572d2db9d4ae4952460914158b3c80ac622bd 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po
@@ -63,7 +63,7 @@ msgid "Don't initialize dynctrls"
 msgstr "不要初始化 dynctrls"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr "丢弃小于该尺寸限制的帧"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -84,7 +84,7 @@ msgstr "超出"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr "保存图片后执行命令。文件名将作为第一个参数传递给命令。"
 

diff --git a/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po
index c63ad7e7b3809a720bde83e8821090445cdb9b51..ac4be2256d65b51ef96e8b04564c9c7e9805ad9a 100644 (file)
--- a/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po
@@ -62,7 +62,7 @@ msgid "Don't initialize dynctrls"
 msgstr "不要初始化 dynctrls"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74
-msgid "Drop frames smaller then this limit"
+msgid "Drop frames smaller than this limit"
 msgstr "丟棄小於該尺寸限制的幀"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
@@ -83,7 +83,7 @@ msgstr "超出"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220
 msgid ""
-"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"Execute command after saving picture. Mjpg-streamer parses the filename as "
 "first parameter to your script."
 msgstr "儲存圖片後執行指令。檔名將作為第一個引數傳遞給指令。"
 

diff --git a/applications/luci-app-mjpg-streamer/root/etc/uci-defaults/40_luci-mjpg-streamer b/applications/luci-app-mjpg-streamer/root/etc/uci-defaults/40_luci-mjpg-streamer
index 6a380cfe5d7fe46796328363d8e1cff4b90a85e7..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100755 (executable)
--- a/applications/luci-app-mjpg-streamer/root/etc/uci-defaults/40_luci-mjpg-streamer
+++ b/applications/luci-app-mjpg-streamer/root/etc/uci-defaults/40_luci-mjpg-streamer
@@ -1,11 +1,4 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@mjpg-streamer[-1]
-       add ucitrack mjpg-streamer
-       set ucitrack.@mjpg-streamer[-1].init=mjpg-streamer
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
index 606b1ae7666c6ac49d524c180825826e9cf7e52d..bcbf03d54eaedad4d0d6cc34f41cc8baba3f4c3c 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
@@ -59,6 +59,7 @@ end
 httping_ssl = mwan_interface:option(Flag, "httping_ssl", translate("Enable ssl tracking"),
        translate("Enables https tracking on ssl port 443"))
 httping_ssl:depends("track_method", "httping")
+httping_ssl.rmempty = false
 httping_ssl.default = httping_ssl.enabled
 
 reliability = mwan_interface:option(Value, "reliability", translate("Tracking reliability"),
@@ -87,8 +88,6 @@ size:value("1016")
 size:value("1472")
 size:value("2040")
 size.datatype = "range(1, 65507)"
-size.rmempty = false
-size.optional = false
 
 max_ttl = mwan_interface:option(Value, "max_ttl", translate("Max TTL"))
 max_ttl.default = "60"

diff --git a/applications/luci-app-nextdns/root/etc/uci-defaults/60_luci-nextdns b/applications/luci-app-nextdns/root/etc/uci-defaults/60_luci-nextdns
index 95fc92280e92b24e8a264cbac479ecebd52cd23b..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100755 (executable)
--- a/applications/luci-app-nextdns/root/etc/uci-defaults/60_luci-nextdns
+++ b/applications/luci-app-nextdns/root/etc/uci-defaults/60_luci-nextdns
@@ -1,11 +1,4 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@nextdns[-1]
-       add ucitrack nextdns
-       set ucitrack.@nextdns[-1].init=nextdns
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-nft-qos/Makefile b/applications/luci-app-nft-qos/Makefile
index 4f86217c432971ee1632825721f612c05f2eb689..a8227de9fd92b7f437076fc4e4f8fd38d49b6a0f 100644 (file)
--- a/applications/luci-app-nft-qos/Makefile
+++ b/applications/luci-app-nft-qos/Makefile
@@ -6,7 +6,7 @@
 
 include $(TOPDIR)/rules.mk
 
-LUCI_TITLE:=Qos over Nftables
+LUCI_TITLE:=QoS over Nftables
 LUCI_DEPENDS:=+luci-compat +nft-qos
 
 include ../../luci.mk

diff --git a/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua b/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua
index 637eb117363af159f028e569fbeecae645d0af0e..4d0527e33f85d679947902263210a723e38d3bb2 100644 (file)
--- a/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua
+++ b/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua
@@ -13,7 +13,7 @@ function index()
        entry({"admin", "status", "realtime", "rate_status"},
                call("action_rate")).leaf = true
        entry({"admin", "services", "nft-qos"}, cbi("nft-qos/nft-qos"),
-               _("Qos over Nftables"), 60)
+               _("QoS over Nftables"), 60)
 end
 
 function _action_rate(rv, n)

diff --git a/applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua b/applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua
index 61a6d76a7d2178cf8ebfb58f42495f41aa5a1ce1..6f67a6110be7b3a86074b68b37a43d22ca960e57 100644 (file)
--- a/applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua
+++ b/applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua
@@ -20,7 +20,7 @@ local enable_priority = uci:get("nft-qos", "default", "priority_enable")
 
 local has_ipv6 = fs.access("/proc/net/ipv6_route")
 
-m = Map("nft-qos", translate("Qos over Nftables"))
+m = Map("nft-qos", translate("QoS over Nftables"))
 
 --
 -- Taboptions
@@ -82,13 +82,13 @@ o.default = def_down or '100'
 o.datatype = "uinteger"
 o:depends("limit_type","dynamic")
 
-o = s:taboption("limit", Value, "dynamic_cidr", translate("Target Network (IPv4/MASK)"), translate("Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"))
+o = s:taboption("limit", Value, "dynamic_cidr", translate("Target Network (IPv4/MASK)"), translate("Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."))
 o.datatype = "cidr4"
 ipc.routes({ family = 4, type = 1 }, function(rt) o.default = rt.dest end)
 o:depends("limit_type","dynamic")
 
 if has_ipv6 then
-       o = s:taboption("limit", Value, "dynamic_cidr6", translate("Target Network6 (IPv6/MASK)"), translate("Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"))
+       o = s:taboption("limit", Value, "dynamic_cidr6", translate("Target Network6 (IPv6/MASK)"), translate("Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."))
        o.datatype = "cidr6"
        o:depends("limit_type","dynamic")
 end
@@ -104,7 +104,7 @@ o = s:taboption("priority", Flag, "priority_enable", translate("Enable Traffic P
 o.default = enable_priority or o.enabled
 o.rmempty = false
 
-o = s:taboption("priority", ListValue, "priority_netdev", translate("Default Network Interface"), translate("Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"))
+o = s:taboption("priority", ListValue, "priority_netdev", translate("Default Network Interface"), translate("Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."))
 o:depends("priority_enable", "1")
 wa.cbi_add_networks(o)
 
@@ -123,9 +123,9 @@ o.datatype = "hostname"
 o.default = 'undefined'
 
 if has_ipv6 then
-       o = x:option(Value, "ipaddr", translate("IP Address(V4 / V6)"))
+       o = x:option(Value, "ipaddr", translate("IP Address (v4 / v6)"))
 else
-       o = x:option(Value, "ipaddr", translate("IP Address(V4 Only)"))
+       o = x:option(Value, "ipaddr", translate("IP Address (v4 Only)"))
 end
 o.datatype = "ipaddr"
 if nixio.fs.access("/tmp/dhcp.leases") or nixio.fs.access("/var/dhcp6.leases") then
@@ -160,9 +160,9 @@ o.datatype = "hostname"
 o.default = 'undefined'
 
 if has_ipv6 then
-       o = y:option(Value, "ipaddr", translate("IP Address(V4 / V6)"))
+       o = y:option(Value, "ipaddr", translate("IP Address (v4 / v6)"))
 else
-       o = y:option(Value, "ipaddr", translate("IP Address(V4 Only)"))
+       o = y:option(Value, "ipaddr", translate("IP Address (v4 Only)"))
 end
 o.datatype = "ipaddr"
 if nixio.fs.access("/tmp/dhcp.leases") or nixio.fs.access("/var/dhcp6.leases") then

diff --git a/applications/luci-app-nft-qos/po/bg/nft-qos.po b/applications/luci-app-nft-qos/po/bg/nft-qos.po
index 6bfdc6b7bd8fbd6f5ab3d7dd3134241f9f2310fc..253ea521bbf01b2033ab9addaed632b8e17b6dcd 100644 (file)
--- a/applications/luci-app-nft-qos/po/bg/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/bg/nft-qos.po
@@ -94,12 +94,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -124,15 +124,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -154,7 +154,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/ca/nft-qos.po b/applications/luci-app-nft-qos/po/ca/nft-qos.po
index e4babf863ebe92a0875c3edb9478234fad5e5817..043c8a21453db4e5514346b4e7685b4ab1587aab 100644 (file)
--- a/applications/luci-app-nft-qos/po/ca/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/ca/nft-qos.po
@@ -100,12 +100,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -130,15 +130,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -160,7 +160,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/cs/nft-qos.po b/applications/luci-app-nft-qos/po/cs/nft-qos.po
index b119020178913ef6ecde3c0e4111ae4c43974239..b6ce28c6ae37e2e966365c31306c71d567d053df 100644 (file)
--- a/applications/luci-app-nft-qos/po/cs/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/cs/nft-qos.po
@@ -100,12 +100,12 @@ msgstr "IP adresa"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -130,15 +130,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -160,7 +160,7 @@ msgstr "Protokol"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/de/nft-qos.po b/applications/luci-app-nft-qos/po/de/nft-qos.po
index 72709e866df3b659327ce80fd3b28068bb0e3407..9e9b533084053fe1a862095cddf78067b7fe2190 100644 (file)
--- a/applications/luci-app-nft-qos/po/de/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/de/nft-qos.po
@@ -100,13 +100,13 @@ msgstr "IP-Adresse"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
-msgstr "IP-Adresse (V4 / V6)"
+msgid "IP Address (v4 / v6)"
+msgstr "IP-Adresse (v4 / v6)"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
-msgstr "IP-Adresse (nur V4)"
+msgid "IP Address (v4 Only)"
+msgstr "IP-Adresse (nur v4)"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
 msgid "Limit Enable"
@@ -130,16 +130,16 @@ msgid "NFT-QoS Settings"
 msgstr "NFT-QoS-Einstellungen"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 "Netzwerkschnittstelle für Traffic Shaping, z.B. br-lan, eth0.1, eth0, etc."
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -161,7 +161,7 @@ msgstr "Protokoll"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/el/nft-qos.po b/applications/luci-app-nft-qos/po/el/nft-qos.po
index 3894b07ffad73a6e3a2df8e0b7788a9153dc19be..75db0de2a1bec95aae585e83390a5c407b58303a 100644 (file)
--- a/applications/luci-app-nft-qos/po/el/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/el/nft-qos.po
@@ -100,12 +100,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -130,15 +130,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -160,7 +160,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/en/nft-qos.po b/applications/luci-app-nft-qos/po/en/nft-qos.po
index f3e6b4249c0a9eaf24a52695ffc52bd050c068d6..3ffccd40456180112c6f78eb9d41e6993257758c 100644 (file)
--- a/applications/luci-app-nft-qos/po/en/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/en/nft-qos.po
@@ -94,12 +94,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -124,15 +124,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -154,7 +154,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/es/nft-qos.po b/applications/luci-app-nft-qos/po/es/nft-qos.po
index c9e4991baf27bcdea5304dec269199b63ec11127..eb56a1a2a3805db3909630f4966196fbc8a41ca6 100644 (file)
--- a/applications/luci-app-nft-qos/po/es/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/es/nft-qos.po
@@ -103,12 +103,12 @@ msgstr "Dirección IP"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr "Dirección IP (v4/v6)"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr "Dirección IP (sólo v4)"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -133,18 +133,18 @@ msgid "NFT-QoS Settings"
 msgstr "Configuración de NFT-QoS"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 "Interfaz de red para configuración de tráfico, por ejemplo, br-lan, eth0.1, "
-"eth0, etc"
+"eth0, etc."
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
-msgstr "Red a aplicar, por ejemplo. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
+msgstr "Red a aplicar, por ejemplo. 192.168.1.0/24, 10.2.0.0/16, etc."
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
-msgstr "Red a aplicar, por ejemplo. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
+msgstr "Red a aplicar, por ejemplo. AAAA::BBBB/64, CCCC::1/128, etc."
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
 msgid "No information available"
@@ -165,7 +165,7 @@ msgstr "Protocolo"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr "Qos sobre Nftables"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/fr/nft-qos.po b/applications/luci-app-nft-qos/po/fr/nft-qos.po
index 3cc0d2db360f132d8f4bd3a519a78e53985058b1..d68c65df439dac24da8cc171f47fa827d54d26e3 100644 (file)
--- a/applications/luci-app-nft-qos/po/fr/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/fr/nft-qos.po
@@ -100,12 +100,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -130,15 +130,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -160,7 +160,7 @@ msgstr "Protocole"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/he/nft-qos.po b/applications/luci-app-nft-qos/po/he/nft-qos.po
index 9938ccffd2d19546a96b8a4a2502f39b3917fc3a..71b810595d6f716f35207003c0e5038ed1d61662 100644 (file)
--- a/applications/luci-app-nft-qos/po/he/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/he/nft-qos.po
@@ -94,12 +94,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -124,15 +124,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -154,7 +154,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/hi/nft-qos.po b/applications/luci-app-nft-qos/po/hi/nft-qos.po
index 29961a28ac751f3a0e9b3eaf2ed678085775b31d..4936b07c1c859968ae0f3be9373bd2e3b8740545 100644 (file)
--- a/applications/luci-app-nft-qos/po/hi/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/hi/nft-qos.po
@@ -94,12 +94,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -124,15 +124,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -154,7 +154,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/hu/nft-qos.po b/applications/luci-app-nft-qos/po/hu/nft-qos.po
index e5669fd0ab763ef98abb59c27c3f339fece71421..5a777eec643fe9285f03b02d26dd5529d49c0a02 100644 (file)
--- a/applications/luci-app-nft-qos/po/hu/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/hu/nft-qos.po
@@ -100,12 +100,12 @@ msgstr "IP-cím"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address(v4 / v6)"
 msgstr "IP-cím (v4/v6)"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr "IP-cím (csak v4)"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -130,16 +130,16 @@ msgid "NFT-QoS Settings"
 msgstr "NFT-QoS beállítások"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 "Hálózati csatoló a forgalom formálásához, például br-lan, eth0.1, eth0, stb."
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
 msgstr "Alkalmazandó hálózat, például 192.168.1.0/24, 10.2.0.0/16, stb."
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
 msgstr "Alkalmazandó hálózat, például AAAA::BBBB/64, CCCC::1/128, stb."
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -161,7 +161,7 @@ msgstr "Protokoll"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr "QoS Nftables fölött"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/it/nft-qos.po b/applications/luci-app-nft-qos/po/it/nft-qos.po
index dbabfee7d96b654f396be9c0e1313957caaf5a7a..c9ddca3a04c997daeb4fd501139f45a592c832d3 100644 (file)
--- a/applications/luci-app-nft-qos/po/it/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/it/nft-qos.po
@@ -94,12 +94,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -124,15 +124,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -154,7 +154,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/ja/nft-qos.po b/applications/luci-app-nft-qos/po/ja/nft-qos.po
index 4863fb6a2424e72380b72a4c9f0ec7163b772e9f..ed8523c6f8b793998a10aeca282f6cabb5f9d67d 100644 (file)
--- a/applications/luci-app-nft-qos/po/ja/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/ja/nft-qos.po
@@ -94,12 +94,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -124,15 +124,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -154,7 +154,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/ko/nft-qos.po b/applications/luci-app-nft-qos/po/ko/nft-qos.po
index 2b7c997d1fece20bf7dabb5a995eab5c671e8576..34ea52ff6ca4be331907a27dda06034685ed9aa4 100644 (file)
--- a/applications/luci-app-nft-qos/po/ko/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/ko/nft-qos.po
@@ -94,12 +94,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -124,15 +124,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -154,7 +154,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/mr/nft-qos.po b/applications/luci-app-nft-qos/po/mr/nft-qos.po
index 9f28240c8b15e61cc0368cd54a585d800a54112f..c2d4f1601b444c0bf0ab0711db9ea9d7cc12bed7 100644 (file)
--- a/applications/luci-app-nft-qos/po/mr/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/mr/nft-qos.po
@@ -100,12 +100,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -130,15 +130,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -160,7 +160,7 @@ msgstr "प्रोटोकॉल"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/ms/nft-qos.po b/applications/luci-app-nft-qos/po/ms/nft-qos.po
index 08bfab1615a9817287c749b4cffb9fd609510eeb..a20c3a05b01ef2a438df8eadbfce0b281765c031 100644 (file)
--- a/applications/luci-app-nft-qos/po/ms/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/ms/nft-qos.po
@@ -100,12 +100,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -130,15 +130,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -160,7 +160,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/nb_NO/nft-qos.po b/applications/luci-app-nft-qos/po/nb_NO/nft-qos.po
index 5ecf9719162d60bcee2b3db042c70392ae127087..a1f1df9f0c3607df7de0c064d6021f81ab0fc58e 100644 (file)
--- a/applications/luci-app-nft-qos/po/nb_NO/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/nb_NO/nft-qos.po
@@ -100,12 +100,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -130,15 +130,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -160,7 +160,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/pl/nft-qos.po b/applications/luci-app-nft-qos/po/pl/nft-qos.po
index 08c3b8f5314c3208394988d6c33eaefce5c8bba7..d64b7b97a9462fd5deac6c064a17016491295da8 100644 (file)
--- a/applications/luci-app-nft-qos/po/pl/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/pl/nft-qos.po
@@ -101,12 +101,12 @@ msgstr "Adres IP"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
-msgstr "Adres IP (V4 / V6)"
+msgid "IP Address (v4 / v6)"
+msgstr "Adres IP (V4 / v6)"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr "Adres IP (tylko v4)"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -131,16 +131,16 @@ msgid "NFT-QoS Settings"
 msgstr "Ustawienia NFT-QoS"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 "Interfejs sieciowy dla kształtowania ruchu, np. br-lan, eth0.1, eth0 itp."
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr "Sieć do zastosowania, np. 192.168.1.0/24, 10.2.0.0/16, itp."
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr "Sieć do zastosowania, np. AAAA::BBBB/64, CCCC::1/128, itp."
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -162,7 +162,7 @@ msgstr "Protokół"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/pt/nft-qos.po b/applications/luci-app-nft-qos/po/pt/nft-qos.po
index 9b1d95e0b9f3d1d2cab6d865e952b29a9c969f49..f8fb5135b9c6e19844402a74e9e9fbe1ea9136f1 100644 (file)
--- a/applications/luci-app-nft-qos/po/pt/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/pt/nft-qos.po
@@ -100,13 +100,13 @@ msgstr "Endereço IP"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
-msgstr "Endereço IP (V4 / V6)"
+msgid "IP Address (v4 / v6)"
+msgstr "Endereço IP (v4 / v6)"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
-msgstr "Endereço IP (apenas V4)"
+msgid "IP Address (v4 Only)"
+msgstr "Endereço IP (apenas v4)"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
 msgid "Limit Enable"
@@ -130,18 +130,18 @@ msgid "NFT-QoS Settings"
 msgstr "Configurações NFT-QoS"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 "Interface de Rede para Traffic Shaping, por exemplo, br-lan, eth0.1, eth0, "
-"etc"
+"etc."
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
-msgstr "Rede a aplicar, por exemplo, 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
+msgstr "Rede a aplicar, por exemplo, 192.168.1.0/24, 10.2.0.0/16, etc."
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
-msgstr "Rede a aplicar, por exemplo, AAAA::BBBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
+msgstr "Rede a aplicar, por exemplo, AAAA::BBBBB/64, CCCC::1/128, etc."
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
 msgid "No information available"
@@ -162,7 +162,7 @@ msgstr "Protocolo"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr "Qos sobre Nftables"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/pt_BR/nft-qos.po b/applications/luci-app-nft-qos/po/pt_BR/nft-qos.po
index 19bc9677bace36381fb2a218eecc16ee53dc34ef..10c1c0c97bbea9faec65235a1b2a9d8049c1aac1 100644 (file)
--- a/applications/luci-app-nft-qos/po/pt_BR/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/pt_BR/nft-qos.po
@@ -100,13 +100,13 @@ msgstr "Endereço IP"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
-msgstr "Endereço IP (V4 / V6)"
+msgid "IP Address (v4 / v6)"
+msgstr "Endereço IP (v4 / v6)"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
-msgstr "Endereço IP (apenas V4)"
+msgid "IP Address (v4 Only)"
+msgstr "Endereço IP (apenas v4)"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
 msgid "Limit Enable"
@@ -130,18 +130,18 @@ msgid "NFT-QoS Settings"
 msgstr "Configurações NFT-QoS"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 "A Interface de rede para realizar Traffic Shaping, por exemplo, br-lan, "
-"eth0.1, eth0.1, eth0, etc"
+"eth0.1, eth0.1, eth0, etc."
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
-msgstr "Rede a ser aplicada, por exemplo, 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
+msgstr "Rede a ser aplicada, por exemplo, 192.168.1.0/24, 10.2.0.0/16, etc."
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
-msgstr "Rede a ser aplicada, por exemplo, AAAA::BBBB/64, CCCC:1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
+msgstr "Rede a ser aplicada, por exemplo, AAAA::BBBB/64, CCCC:1/128, etc."
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
 msgid "No information available"
@@ -162,7 +162,7 @@ msgstr "Protocolo"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr "Qos sobre Nftables"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/ro/nft-qos.po b/applications/luci-app-nft-qos/po/ro/nft-qos.po
index 1e6bff416d75a7dacfa8aba298a7a2018e7bf60f..1b8936976b887b8c4397980d91594669708fefe4 100644 (file)
--- a/applications/luci-app-nft-qos/po/ro/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/ro/nft-qos.po
@@ -101,12 +101,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -131,15 +131,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -161,7 +161,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/ru/nft-qos.po b/applications/luci-app-nft-qos/po/ru/nft-qos.po
index 5217aa6b8ecd957747e9948dd7bfd312c4dd551e..c5f17cb79a0f6ba4bc4bd642d89e9d486bbc08c7 100644 (file)
--- a/applications/luci-app-nft-qos/po/ru/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/ru/nft-qos.po
@@ -101,12 +101,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -131,15 +131,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -161,7 +161,7 @@ msgstr "Протокол"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/sk/nft-qos.po b/applications/luci-app-nft-qos/po/sk/nft-qos.po
index 6807137602ba3e42727a6915f172a05be075c13f..05782fd8eb6089df16c17bbc40a63f3ed33627b7 100644 (file)
--- a/applications/luci-app-nft-qos/po/sk/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/sk/nft-qos.po
@@ -94,12 +94,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -124,15 +124,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -154,7 +154,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/sv/nft-qos.po b/applications/luci-app-nft-qos/po/sv/nft-qos.po
index 465c235ea6d3db5ca3df6489aa443e6885361938..bfc9ce8af5b6924b1bef1e6dc02c8aade0ca5411 100644 (file)
--- a/applications/luci-app-nft-qos/po/sv/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/sv/nft-qos.po
@@ -100,12 +100,12 @@ msgstr "IP-adress"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -130,15 +130,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -160,7 +160,7 @@ msgstr "Protokoll"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/tr/nft-qos.po b/applications/luci-app-nft-qos/po/tr/nft-qos.po
index 761eb07df9208cafc950cc086d8cac8b1266cb90..cb1a48063f57beda054f4be35fc1faa40fe340b0 100644 (file)
--- a/applications/luci-app-nft-qos/po/tr/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/tr/nft-qos.po
@@ -100,12 +100,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -130,15 +130,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -160,7 +160,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/uk/nft-qos.po b/applications/luci-app-nft-qos/po/uk/nft-qos.po
index 34241b60fedb4a0d02f16a8762ab19b2adf9208f..d82addad2da9bf414453ba95dd466d4167466793 100644 (file)
--- a/applications/luci-app-nft-qos/po/uk/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/uk/nft-qos.po
@@ -101,12 +101,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -131,15 +131,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -161,7 +161,7 @@ msgstr "Протокол"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/vi/nft-qos.po b/applications/luci-app-nft-qos/po/vi/nft-qos.po
index dcbba216a1a530ccdd685db8eab18be3341b596c..faf04cea853c4ddd499bf91b4e65457768a8bcc8 100644 (file)
--- a/applications/luci-app-nft-qos/po/vi/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/vi/nft-qos.po
@@ -100,12 +100,12 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
+msgid "IP Address (v4 / v6)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
+msgid "IP Address (v4 Only)"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
@@ -130,15 +130,15 @@ msgid "NFT-QoS Settings"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -160,7 +160,7 @@ msgstr "Giao thức"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/zh-cn/nft-qos.po b/applications/luci-app-nft-qos/po/zh-cn/nft-qos.po
index 2a0e90d82770e69ed0ada80e84c8f789771f37de..0ebfae2dfd90b40aa45e134acdc5227e2b9e8d0a 100644 (file)
--- a/applications/luci-app-nft-qos/po/zh-cn/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/zh-cn/nft-qos.po
@@ -106,13 +106,13 @@ msgstr "IP 地址"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
-msgstr "IP 地址（V4 / V6）"
+msgid "IP Address (v4 / v6)"
+msgstr "IP 地址（v4 / v6）"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
-msgstr "IP 地址（仅 V4）"
+msgid "IP Address (v4 Only)"
+msgstr "IP 地址（仅 v4）"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
 msgid "Limit Enable"
@@ -136,15 +136,15 @@ msgid "NFT-QoS Settings"
 msgstr "NFT-QoS 设置"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr "流量整形的目标网络接口，例如br-lan、eth0.1、eth0等"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr "将要应用规则的网络，例如192.168.1.0/24、10.2.0.0/16等"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr "将要应用规则的网络，例如AAAA::BBBB/64、CCCC::1/128等"
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -166,7 +166,7 @@ msgstr "协议"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr "QoS Nftables 版"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nft-qos/po/zh-tw/nft-qos.po b/applications/luci-app-nft-qos/po/zh-tw/nft-qos.po
index 0b6c580d867d3579bea063b43feea59329a051c8..6d6cc9dfd2d01b6e7dfbf4ee3c36b7b87f74110f 100644 (file)
--- a/applications/luci-app-nft-qos/po/zh-tw/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/zh-tw/nft-qos.po
@@ -106,13 +106,13 @@ msgstr "IP 位址"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
-msgid "IP Address(V4 / V6)"
-msgstr "IP 位址（V4 / V6）"
+msgid "IP Address (v4 / v6)"
+msgstr "IP 位址（v4 / v6）"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
-msgid "IP Address(V4 Only)"
-msgstr "IP 位址（僅 V4）"
+msgid "IP Address (v4 Only)"
+msgstr "IP 位址（僅 v4）"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
 msgid "Limit Enable"
@@ -136,15 +136,15 @@ msgid "NFT-QoS Settings"
 msgstr "NFT-QoS 設定"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
-msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
 msgstr "流量整形的目標網路介面，例如br-lan、eth0.1、eth0等"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
-msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
 msgstr "將要應用規則的網路，例如192.168.1.0/24、10.2.0.0/16等"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
-msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."
 msgstr "將要應用規則的網路，例如AAAA::BBBB/64、CCCC::1/128等"
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
@@ -166,7 +166,7 @@ msgstr "協議"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
-msgid "Qos over Nftables"
+msgid "QoS over Nftables"
 msgstr "QoS Nftables 版"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12

diff --git a/applications/luci-app-nlbwmon/luasrc/model/cbi/nlbw/config.lua b/applications/luci-app-nlbwmon/luasrc/model/cbi/nlbw/config.lua
index 08df5b332e7dde8e9f558491c02f03fcfe9c9548..8c54b438b03df70723e6941647b1612fc21be09c 100644 (file)
--- a/applications/luci-app-nlbwmon/luasrc/model/cbi/nlbw/config.lua
+++ b/applications/luci-app-nlbwmon/luasrc/model/cbi/nlbw/config.lua
@@ -60,7 +60,7 @@ end
 
 
 interval = s:taboption("general", Value, "_interval", translate("Due date"),
-       translate("Day of month to restart the accounting period. Use negative values to count towards the end of month, e.g. \"-5\" to specify the 27th of July or the 24th of Februrary."))
+       translate("Day of month to restart the accounting period. Use negative values to count towards the end of month, e.g. \"-5\" to specify the 27th of July or the 24th of February."))
 
 interval.datatype = "or(range(1,31),range(-31,-1))"
 interval.placeholder = "1"

diff --git a/applications/luci-app-nlbwmon/po/bg/nlbwmon.po b/applications/luci-app-nlbwmon/po/bg/nlbwmon.po
index e42452ea310a8ce1c44b64dd7cfe789ac1aa45c5..04393cb9cc169550e2ba0740d29de2e33877116f 100644 (file)
--- a/applications/luci-app-nlbwmon/po/bg/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/bg/nlbwmon.po
@@ -206,7 +206,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/ca/nlbwmon.po b/applications/luci-app-nlbwmon/po/ca/nlbwmon.po
index 16784c0bd2b62a6a80d88a8a728eec2b9f75371b..80883793015b626b822f8cb40fa520f2a7d5582b 100644 (file)
--- a/applications/luci-app-nlbwmon/po/ca/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/ca/nlbwmon.po
@@ -212,7 +212,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/cs/nlbwmon.po b/applications/luci-app-nlbwmon/po/cs/nlbwmon.po
index 62360e4de7ab06fd6ac2b1064d84e3fb6a7d7b1c..80fdcfb97b846fe0a5fed8e4bd94dbec07a4ca35 100644 (file)
--- a/applications/luci-app-nlbwmon/po/cs/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/cs/nlbwmon.po
@@ -212,7 +212,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/de/nlbwmon.po b/applications/luci-app-nlbwmon/po/de/nlbwmon.po
index f41cdd8387149566d5e0e543df3e7dbb0d172974..f42956307fd0434bfc3ebc8ffbe5d55c8a767dff 100644 (file)
--- a/applications/luci-app-nlbwmon/po/de/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/de/nlbwmon.po
@@ -212,7 +212,7 @@ msgstr "Tag des Monats"
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/el/nlbwmon.po b/applications/luci-app-nlbwmon/po/el/nlbwmon.po
index c4a2ed457c73678f8fdb51a0b9cf7faf950c6cd9..5c2dd226c3040225974e69cf6650197297c3b44b 100644 (file)
--- a/applications/luci-app-nlbwmon/po/el/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/el/nlbwmon.po
@@ -212,7 +212,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/en/nlbwmon.po b/applications/luci-app-nlbwmon/po/en/nlbwmon.po
index 53835d3c9ce58098b7228248643a3fc2443ddf76..7072ee0733c3c3a4c549b74758173eaadc318d9b 100644 (file)
--- a/applications/luci-app-nlbwmon/po/en/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/en/nlbwmon.po
@@ -206,7 +206,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/es/nlbwmon.po b/applications/luci-app-nlbwmon/po/es/nlbwmon.po
index d398f1960ac72d4e54c1ea8a29a04267bc00823c..d96430d964084a48393d3c3de4dbb3a788e1934c 100644 (file)
--- a/applications/luci-app-nlbwmon/po/es/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/es/nlbwmon.po
@@ -235,7 +235,7 @@ msgstr "Dia del mes"
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 "Día del mes para reiniciar el período contable. Use valores negativos para "
 "contar hacia el final del mes, p. Ej. \"-5\" para especificar el 27 de julio "

diff --git a/applications/luci-app-nlbwmon/po/fr/nlbwmon.po b/applications/luci-app-nlbwmon/po/fr/nlbwmon.po
index f94b4ea5706653519790736e43a3db0bb4e8839d..84aa31349a82f59cb887184b0091d37d3fee394e 100644 (file)
--- a/applications/luci-app-nlbwmon/po/fr/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/fr/nlbwmon.po
@@ -212,7 +212,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/he/nlbwmon.po b/applications/luci-app-nlbwmon/po/he/nlbwmon.po
index dad5ca0ac51f97478851011793f43ed91683817d..aa51572d190e0f1c1fe9a2a8910fd861d6944daa 100644 (file)
--- a/applications/luci-app-nlbwmon/po/he/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/he/nlbwmon.po
@@ -206,7 +206,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/hi/nlbwmon.po b/applications/luci-app-nlbwmon/po/hi/nlbwmon.po
index d8ffa0582bb6e08efc83f5cb5a43af3f651c8c6e..546fe2905a63fd07f209427841abb241bed6c780 100644 (file)
--- a/applications/luci-app-nlbwmon/po/hi/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/hi/nlbwmon.po
@@ -206,7 +206,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/hu/nlbwmon.po b/applications/luci-app-nlbwmon/po/hu/nlbwmon.po
index f5159f36f6df5f939581594e7afbdf05ba968fbe..f7f21d62db56113a38a0caf040635547639c7450 100644 (file)
--- a/applications/luci-app-nlbwmon/po/hu/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/hu/nlbwmon.po
@@ -227,7 +227,7 @@ msgstr "Hónap napja"
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 "A hónap napja az elszámolási időszak újraindításához. Használjon negatív "
 "értékeket a hónap végétől való számoláshoz, például a „-5” július 27. vagy "

diff --git a/applications/luci-app-nlbwmon/po/it/nlbwmon.po b/applications/luci-app-nlbwmon/po/it/nlbwmon.po
index 7a7c3c8c3409a61e93bcd76c59d7caf2b431cea3..e4f934872b8d0e15143e1469eda0299a18fc52dc 100644 (file)
--- a/applications/luci-app-nlbwmon/po/it/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/it/nlbwmon.po
@@ -212,7 +212,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/ja/nlbwmon.po b/applications/luci-app-nlbwmon/po/ja/nlbwmon.po
index c8e42c54bbbdbbb9a2adc13f336e38583802cae8..91484d2dc5d7f471d79467e5f0cb17d45222581f 100644 (file)
--- a/applications/luci-app-nlbwmon/po/ja/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/ja/nlbwmon.po
@@ -220,7 +220,7 @@ msgstr "月間"
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 "月の中で新たな収集期間を開始する日です。月の最終日からの日数をマイナス値で指"
 "定することができます（例: 7月27日または2月24日は \"-5\"）。"

diff --git a/applications/luci-app-nlbwmon/po/ko/nlbwmon.po b/applications/luci-app-nlbwmon/po/ko/nlbwmon.po
index 8aa763bc7f1afa22c57773b6a168dc4d1e1da93f..02ab21ee74e0bc26a76465c7032861fe6c7a1c6b 100644 (file)
--- a/applications/luci-app-nlbwmon/po/ko/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/ko/nlbwmon.po
@@ -206,7 +206,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/mr/nlbwmon.po b/applications/luci-app-nlbwmon/po/mr/nlbwmon.po
index 48ae217c5c4232bae8a827a4f042818bb5f0f059..8b8b6b0677327d9bd1e5679ae230b55b2a9ee4d0 100644 (file)
--- a/applications/luci-app-nlbwmon/po/mr/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/mr/nlbwmon.po
@@ -212,7 +212,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/ms/nlbwmon.po b/applications/luci-app-nlbwmon/po/ms/nlbwmon.po
index 2f56cdd2f17fabb3562758d467b9a8c59d9541b8..117b3498e98a09c334ab175eab09a90b613d66c0 100644 (file)
--- a/applications/luci-app-nlbwmon/po/ms/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/ms/nlbwmon.po
@@ -212,7 +212,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/nb_NO/nlbwmon.po b/applications/luci-app-nlbwmon/po/nb_NO/nlbwmon.po
index 8ca8b0504cbaeda8bbf24b884b6c26ed32434ece..dcf5f2c3b191ea5304413edc9018a1c3d70e5fb5 100644 (file)
--- a/applications/luci-app-nlbwmon/po/nb_NO/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/nb_NO/nlbwmon.po
@@ -212,7 +212,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/pl/nlbwmon.po b/applications/luci-app-nlbwmon/po/pl/nlbwmon.po
index 43ffbf1411292e535e89cd68efc1193ccd5294cf..050f18f95dd6281b273e3df15330712954dee359 100644 (file)
--- a/applications/luci-app-nlbwmon/po/pl/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/pl/nlbwmon.po
@@ -223,7 +223,7 @@ msgstr "Dzień miesiąca"
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 "Dzień miesiąca do ponownego rozpoczęcia okresu rozliczeniowego. Wartości "
 "ujemne należy stosować do liczenia pod koniec miesiąca, np. \"-5\", aby "

diff --git a/applications/luci-app-nlbwmon/po/pt/nlbwmon.po b/applications/luci-app-nlbwmon/po/pt/nlbwmon.po
index 8db6c5f1c881e7dc478c5ba684fca03360c5f241..3d58a88a277ad64bad7ac2d13dd26dc1f5598db1 100644 (file)
--- a/applications/luci-app-nlbwmon/po/pt/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/pt/nlbwmon.po
@@ -225,7 +225,7 @@ msgstr "Dia do mês"
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 "Dia do mês para reiniciar o período contábil. Use valores negativos para "
 "contar para o final do mês, por exemplo \"-5\" para especificar o dia 27 de "

diff --git a/applications/luci-app-nlbwmon/po/pt_BR/nlbwmon.po b/applications/luci-app-nlbwmon/po/pt_BR/nlbwmon.po
index 66ec7ea67b56a6c0e96b5d36d9fd26d4264c904b..a44987420441512dc2e35104810709ea17489263 100644 (file)
--- a/applications/luci-app-nlbwmon/po/pt_BR/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/pt_BR/nlbwmon.po
@@ -232,7 +232,7 @@ msgstr "Dia do mês"
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 "Dia do mês para reiniciar o período contábil. Use valores negativos para "
 "contar no final do mês, por exemplo \"-5\" para especificar o dia 27 de "

diff --git a/applications/luci-app-nlbwmon/po/ro/nlbwmon.po b/applications/luci-app-nlbwmon/po/ro/nlbwmon.po
index 04d925712d5985cfc3411dd7383eaa3246c3bf50..0407507b4331432dd92e0fecba3268be6d9251d1 100644 (file)
--- a/applications/luci-app-nlbwmon/po/ro/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/ro/nlbwmon.po
@@ -213,7 +213,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/ru/nlbwmon.po b/applications/luci-app-nlbwmon/po/ru/nlbwmon.po
index 630e4ec9be6b1b084b7d7777a5490e02d993b9fe..f3ce7f1b54d22ab16adb15547ae1bb6542a5c672 100644 (file)
--- a/applications/luci-app-nlbwmon/po/ru/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/ru/nlbwmon.po
@@ -231,7 +231,7 @@ msgstr "День месяца"
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 "Выберите день месяца для перезапуска отчетного периода. Используйте "
 "отрицательные значения для подсчета к концу месяца, например, '-5', чтобы "

diff --git a/applications/luci-app-nlbwmon/po/sk/nlbwmon.po b/applications/luci-app-nlbwmon/po/sk/nlbwmon.po
index 699bdcc11f7faf34ef4abf6ee7bc7122ff743836..cda0fa03734c07a5338d40c9f09d01751dde9f2a 100644 (file)
--- a/applications/luci-app-nlbwmon/po/sk/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/sk/nlbwmon.po
@@ -206,7 +206,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/sv/nlbwmon.po b/applications/luci-app-nlbwmon/po/sv/nlbwmon.po
index 82f368a0f09a93a6c34d9bdc74977e40f87a3ce1..57279796bc76b49636c50e38b793a789494f6ebf 100644 (file)
--- a/applications/luci-app-nlbwmon/po/sv/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/sv/nlbwmon.po
@@ -212,7 +212,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/templates/nlbwmon.pot b/applications/luci-app-nlbwmon/po/templates/nlbwmon.pot
index aebb60f2140937fa19e6b658754fba8ad05e5620..a469bbd4657796a0be0f1b19811af092ff472c86 100644 (file)
--- a/applications/luci-app-nlbwmon/po/templates/nlbwmon.pot
+++ b/applications/luci-app-nlbwmon/po/templates/nlbwmon.pot
@@ -203,7 +203,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/tr/nlbwmon.po b/applications/luci-app-nlbwmon/po/tr/nlbwmon.po
index 95c4573af823c41783dcc14e4d0958b784631699..ed92393bac3982a95cdd221c0e94ef3d65aabd54 100644 (file)
--- a/applications/luci-app-nlbwmon/po/tr/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/tr/nlbwmon.po
@@ -212,7 +212,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/uk/nlbwmon.po b/applications/luci-app-nlbwmon/po/uk/nlbwmon.po
index 65d17f719b3d61f7c76825a9f7b7b394eee8a778..0119836ebbde23608a15ef376b5aa388362ad88b 100644 (file)
--- a/applications/luci-app-nlbwmon/po/uk/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/uk/nlbwmon.po
@@ -213,7 +213,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/vi/nlbwmon.po b/applications/luci-app-nlbwmon/po/vi/nlbwmon.po
index a6d6ac2d40bdb8cf7fb18fdbe623ddbcb4475eac..c5ea675948774154eefdc49fcb38dc050219e601 100644 (file)
--- a/applications/luci-app-nlbwmon/po/vi/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/vi/nlbwmon.po
@@ -212,7 +212,7 @@ msgstr ""
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 
 #: applications/luci-app-nlbwmon/luasrc/controller/nlbw.lua:8

diff --git a/applications/luci-app-nlbwmon/po/zh-cn/nlbwmon.po b/applications/luci-app-nlbwmon/po/zh-cn/nlbwmon.po
index 5c4ae3c0c1d6b04d877d7ae391c6e7e46da465b2..395b0bed3a66ce9d6365571be7e119507517ed80 100644 (file)
--- a/applications/luci-app-nlbwmon/po/zh-cn/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/zh-cn/nlbwmon.po
@@ -219,7 +219,7 @@ msgstr "每月的某一天"
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 "每个月重启统计周期的日期。使用负数表示从月底开始计算，例如：\"-5\" 可以表示7"
 "月27号或者2月24号。"

diff --git a/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po b/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po
index d72d509942d773ff9fe25ae5d4092d720dfff439..8bc1f891d04977fc274a72d03ccff4ad1316b7f3 100644 (file)
--- a/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po
@@ -219,7 +219,7 @@ msgstr "每月的某一天"
 msgid ""
 "Day of month to restart the accounting period. Use negative values to count "
 "towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
-"24th of Februrary."
+"24th of February."
 msgstr ""
 "每個月重啟統計週期的日期。使用負數表示從月底開始計算，例如：\"-5\" 可以表示7"
 "月27號或者2月24號。"

diff --git a/applications/luci-app-nlbwmon/root/etc/uci-defaults/40_luci-nlbwmon b/applications/luci-app-nlbwmon/root/etc/uci-defaults/40_luci-nlbwmon
index c9771779ee6862d27a8b030d10714353ce421a1d..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100644 (file)
--- a/applications/luci-app-nlbwmon/root/etc/uci-defaults/40_luci-nlbwmon
+++ b/applications/luci-app-nlbwmon/root/etc/uci-defaults/40_luci-nlbwmon
@@ -1,11 +1,4 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@nlbwmon[-1]
-       add ucitrack nlbwmon
-       set ucitrack.@nlbwmon[-1].init=nlbwmon
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-noddos/luasrc/view/noddos/clients.htm b/applications/luci-app-noddos/luasrc/view/noddos/clients.htm
index 4caf3e04e41dcbd9cc80003cf0dd87aeb29dfec1..171a5e9aabda354a11d2959d4780e055c35e61e3 100644 (file)
--- a/applications/luci-app-noddos/luasrc/view/noddos/clients.htm
+++ b/applications/luci-app-noddos/luasrc/view/noddos/clients.htm
@@ -79,8 +79,8 @@
                     <div class="th cbi-section-table-cell"><%:MAC%></div>
                     <div class="th cbi-section-table-cell"><%:Manufacturer%></div>
                     <div class="th cbi-section-table-cell"><%:Model%></div>
-                    <div class="th cbi-section-table-cell"><%:DhcpVendor%></div>
-                    <div class="th cbi-section-table-cell"><%:DhcpHostname%></div>
+                    <div class="th cbi-section-table-cell"><%:DHCP Vendor%></div>
+                    <div class="th cbi-section-table-cell"><%:DHCP Hostname%></div>
                 </div>
 
                 <%

diff --git a/applications/luci-app-noddos/root/etc/uci-defaults/40_luci-noddos b/applications/luci-app-noddos/root/etc/uci-defaults/40_luci-noddos
index 17abbc41ca8e71fee3f812c841b015f159781376..5225b63a8e89cf8b30043de193eafcee3ad77909 100644 (file)
--- a/applications/luci-app-noddos/root/etc/uci-defaults/40_luci-noddos
+++ b/applications/luci-app-noddos/root/etc/uci-defaults/40_luci-noddos
@@ -3,12 +3,5 @@
 # Copyright (C) 2017 Steven Hessing (steven.hessing@live.com)
 # This is free software, licensed under the GNU General Public License v3
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@noddos[-1]
-       add ucitrack noddos
-       set ucitrack.@noddos[-1].init=noddos
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua b/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua
index 6aaf1d2c22f2d55edb9672ace4b3394a20ee0999..9bf1bda5bdf22f52174b9316ad8a15674e3c6c1d 100644 (file)
--- a/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua
+++ b/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua
@@ -88,7 +88,7 @@ o = s:option(Value, "maxstartdelay", translate("Maximum Start Delay"), translate
 o.optional = true
 o.datatype = "uinteger"
 
-o = s:option(Value, "maxretry", translate("Maxium Retries"), translate("Maximum number of times to try starting a driver."))
+o = s:option(Value, "maxretry", translate("Maximum Retries"), translate("Maximum number of times to try starting a driver."))
 o.optional = true
 o.placeholder = 1
 o.datatype = "uinteger"
@@ -155,7 +155,7 @@ o = s:option(Value, "maxreport", translate("Max USB HID Length Reported"), trans
 o.optional = true
 o.datatype = "uinteger"
 
-o = s:option(Value, "maxstartdelay", translate("Maxium Start Delay"), translate("Time in seconds that upsdrvctl will wait for driver to finish starting"))
+o = s:option(Value, "maxstartdelay", translate("Maximum Start Delay"), translate("Time in seconds that upsdrvctl will wait for driver to finish starting"))
 o.optional = true
 o.datatype = "uinteger"
 o.placeholder = 45

diff --git a/applications/luci-app-nut/po/bg/nut.po b/applications/luci-app-nut/po/bg/nut.po
index 24044c0d0e31de262c37e94d4d7ffe4414506140..dc9ef2801a90706e85f80127925d571331bac2ae 100644 (file)
--- a/applications/luci-app-nut/po/bg/nut.po
+++ b/applications/luci-app-nut/po/bg/nut.po
@@ -235,7 +235,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/ca/nut.po b/applications/luci-app-nut/po/ca/nut.po
index 3f602137f1e28ba03f5f94e489a8f5bc940cdbba..7d0c25f5f413e0fcc0d3c301ec1635b16175d88e 100644 (file)
--- a/applications/luci-app-nut/po/ca/nut.po
+++ b/applications/luci-app-nut/po/ca/nut.po
@@ -237,7 +237,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/cs/nut.po b/applications/luci-app-nut/po/cs/nut.po
index fe3f875ac97b4b8350fc52b175c8e968cadf316f..6ab219cb5bc80266d9e883c41d596c49e39a2aa9 100644 (file)
--- a/applications/luci-app-nut/po/cs/nut.po
+++ b/applications/luci-app-nut/po/cs/nut.po
@@ -237,7 +237,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/de/nut.po b/applications/luci-app-nut/po/de/nut.po
index de57d1be22dbc115989f1bf8ff490d3ee4378d79..3203b422fb0acb9a0d6abfbe741ee13a8e0b86f8 100644 (file)
--- a/applications/luci-app-nut/po/de/nut.po
+++ b/applications/luci-app-nut/po/de/nut.po
@@ -237,7 +237,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/el/nut.po b/applications/luci-app-nut/po/el/nut.po
index ff54828e2f34432b771986775cdd2fa33c0bb6ff..bbd7da7a1bd401e554b6aa331da787130ae587a7 100644 (file)
--- a/applications/luci-app-nut/po/el/nut.po
+++ b/applications/luci-app-nut/po/el/nut.po
@@ -235,7 +235,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/en/nut.po b/applications/luci-app-nut/po/en/nut.po
index 0f22c26ae0e6fcc37b7742a6f1e3e11cb805f3a8..2da8316cf18de34ecefeb6b667634a77c7090490 100644 (file)
--- a/applications/luci-app-nut/po/en/nut.po
+++ b/applications/luci-app-nut/po/en/nut.po
@@ -237,8 +237,8 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr "Maximum time in seconds between refresh of UPS status"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
-msgstr "Maxium Retries"
+msgid "Maximum Retries"
+msgstr "Maximum Retries"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158
 msgid "Maxium Start Delay"

diff --git a/applications/luci-app-nut/po/es/nut.po b/applications/luci-app-nut/po/es/nut.po
index 9b374ff4578cca3b87ac417a1921e6770863748a..fda309f060358f29a110b57b6618785e9b7b3b98 100644 (file)
--- a/applications/luci-app-nut/po/es/nut.po
+++ b/applications/luci-app-nut/po/es/nut.po
@@ -245,7 +245,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr "Tiempo máximo en segundos para la actualización del estado de UPS"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr "Reintentos máximos"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/fr/nut.po b/applications/luci-app-nut/po/fr/nut.po
index f8ac642817e52c8648880258a0e2f861b7341074..37bbafe6c54c49682ea3164450466e4c8092da7b 100644 (file)
--- a/applications/luci-app-nut/po/fr/nut.po
+++ b/applications/luci-app-nut/po/fr/nut.po
@@ -237,7 +237,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/he/nut.po b/applications/luci-app-nut/po/he/nut.po
index 160f354d8692681473f763b3bdf5a07d389e3cce..7d56618d8e25a494b3cfd97a94ebe2e1546176bc 100644 (file)
--- a/applications/luci-app-nut/po/he/nut.po
+++ b/applications/luci-app-nut/po/he/nut.po
@@ -236,7 +236,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/hi/nut.po b/applications/luci-app-nut/po/hi/nut.po
index e3d81576437f7cf91fe44b7e2fb4d732dbc6bbfd..eab90032e1b039298705ee7386d3af6edc8c92b9 100644 (file)
--- a/applications/luci-app-nut/po/hi/nut.po
+++ b/applications/luci-app-nut/po/hi/nut.po
@@ -235,7 +235,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/hu/nut.po b/applications/luci-app-nut/po/hu/nut.po
index c1add79d1cdfbd139596fbaad00e23b486e8ec07..dafac61ce22556e923298cb023a0dba2a3a9b139 100644 (file)
--- a/applications/luci-app-nut/po/hu/nut.po
+++ b/applications/luci-app-nut/po/hu/nut.po
@@ -244,7 +244,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr "Legnagyobb idő másodpercben az UPS állapot frissítése között"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr "Legtöbb újrapróbálás"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/it/nut.po b/applications/luci-app-nut/po/it/nut.po
index 37fe8738b123e300bb91d6c6db5aaad74b16562a..27be7fd34ae4f912dbbc4f929c73c8fe8561e0ca 100644 (file)
--- a/applications/luci-app-nut/po/it/nut.po
+++ b/applications/luci-app-nut/po/it/nut.po
@@ -235,7 +235,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/ja/nut.po b/applications/luci-app-nut/po/ja/nut.po
index 3e9d4414a0ced0a62981c5c80c1087e16c6a1a64..5e7c42b04e50d7a30fbae94d6286be947c57a91f 100644 (file)
--- a/applications/luci-app-nut/po/ja/nut.po
+++ b/applications/luci-app-nut/po/ja/nut.po
@@ -237,7 +237,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/ko/nut.po b/applications/luci-app-nut/po/ko/nut.po
index 2204cd56f2cc8116c4da31dfb02acf428c560dbb..63accb515b815e742846f11ea2d770d80dc52b48 100644 (file)
--- a/applications/luci-app-nut/po/ko/nut.po
+++ b/applications/luci-app-nut/po/ko/nut.po
@@ -235,7 +235,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/mr/nut.po b/applications/luci-app-nut/po/mr/nut.po
index cc751c11fdc410f04ac92aa86d54c8ced18e23d2..4fae1c54cb28ac3762b7643e6f318ab93bbef56b 100644 (file)
--- a/applications/luci-app-nut/po/mr/nut.po
+++ b/applications/luci-app-nut/po/mr/nut.po
@@ -237,7 +237,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/ms/nut.po b/applications/luci-app-nut/po/ms/nut.po
index 78875f1f521b582f7d7b6b15919185bbd4c24d74..6287447dd36260a44d6c44447cbfccc24dcac468 100644 (file)
--- a/applications/luci-app-nut/po/ms/nut.po
+++ b/applications/luci-app-nut/po/ms/nut.po
@@ -235,7 +235,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/nb_NO/nut.po b/applications/luci-app-nut/po/nb_NO/nut.po
index 82cee04fe57d7beb2f30fb323669a6e30a3711f9..d4f42ebeb7fe380226cdddcff50c771a1e2311d1 100644 (file)
--- a/applications/luci-app-nut/po/nb_NO/nut.po
+++ b/applications/luci-app-nut/po/nb_NO/nut.po
@@ -235,7 +235,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/pl/nut.po b/applications/luci-app-nut/po/pl/nut.po
index 1a58a34babf7e203123ea23a3ba802aad337009c..4d8a20e68f00c352a29b8dddfc3f0b9a71cedbff 100644 (file)
--- a/applications/luci-app-nut/po/pl/nut.po
+++ b/applications/luci-app-nut/po/pl/nut.po
@@ -238,7 +238,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/pt/nut.po b/applications/luci-app-nut/po/pt/nut.po
index f511a6f0237581fcaf8328440a1b93f20f22fc65..ad8e65ae297b0af589f01456b127a18e6b0e09b1 100644 (file)
--- a/applications/luci-app-nut/po/pt/nut.po
+++ b/applications/luci-app-nut/po/pt/nut.po
@@ -243,7 +243,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr "Tempo máximo em segundos para atualizar a condição do estado do UPS"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr "Quantidade Máxima de Tentativas"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/pt_BR/nut.po b/applications/luci-app-nut/po/pt_BR/nut.po
index 35742cc00e4bbcb11e03a3975af10621a431fb96..b7d707bd6bf05c0e6bf0d9003232a6cdf259d34e 100644 (file)
--- a/applications/luci-app-nut/po/pt_BR/nut.po
+++ b/applications/luci-app-nut/po/pt_BR/nut.po
@@ -243,7 +243,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr "Tempo máximo em segundos para atualizar a condição do estado do Nobreak"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr "Quantidade Máxima de Tentativas"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/ro/nut.po b/applications/luci-app-nut/po/ro/nut.po
index 60f877bd4ed86b173c4ee8e2bc1d24b18d6b755c..69737cfa01909718d91428fa04af9ff8b2dc9136 100644 (file)
--- a/applications/luci-app-nut/po/ro/nut.po
+++ b/applications/luci-app-nut/po/ro/nut.po
@@ -236,7 +236,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/ru/nut.po b/applications/luci-app-nut/po/ru/nut.po
index 369a079875be1d94379ea99c1e8e55ddf5769b0d..f42f6841a75cbe028fd804e912bb167d4e2b6eb0 100644 (file)
--- a/applications/luci-app-nut/po/ru/nut.po
+++ b/applications/luci-app-nut/po/ru/nut.po
@@ -238,7 +238,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/sk/nut.po b/applications/luci-app-nut/po/sk/nut.po
index 751a738d75a910fab1579a2db3bd0fcc11774861..6dacf12f3039348cd2dcc84f2de775fe5e10ab99 100644 (file)
--- a/applications/luci-app-nut/po/sk/nut.po
+++ b/applications/luci-app-nut/po/sk/nut.po
@@ -235,7 +235,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/sv/nut.po b/applications/luci-app-nut/po/sv/nut.po
index 6f2dfe74fcc22e623d17b30f882a0b1ec4f29d30..39b97601ce6d5ab2a7f9e670befbc5222e4f000b 100644 (file)
--- a/applications/luci-app-nut/po/sv/nut.po
+++ b/applications/luci-app-nut/po/sv/nut.po
@@ -237,7 +237,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/templates/nut.pot b/applications/luci-app-nut/po/templates/nut.pot
index 945c31ddabc724cb4ced5b46e20082924f261479..9a57af5e7e4c8f6791126832fe17349f12fbe2f9 100644 (file)
--- a/applications/luci-app-nut/po/templates/nut.pot
+++ b/applications/luci-app-nut/po/templates/nut.pot
@@ -226,7 +226,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/tr/nut.po b/applications/luci-app-nut/po/tr/nut.po
index 5ce5a473d5ca5b6165248536cc9c0e99991837ee..117166bba630b70a99c67ba07b70f0f23cf22612 100644 (file)
--- a/applications/luci-app-nut/po/tr/nut.po
+++ b/applications/luci-app-nut/po/tr/nut.po
@@ -235,7 +235,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/uk/nut.po b/applications/luci-app-nut/po/uk/nut.po
index 723c9cc6039187bb9d1fb3546a6d7bbd65e585a5..32db2110415bf6bfe215bb01c85a13f9ccfe2dbe 100644 (file)
--- a/applications/luci-app-nut/po/uk/nut.po
+++ b/applications/luci-app-nut/po/uk/nut.po
@@ -238,7 +238,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/vi/nut.po b/applications/luci-app-nut/po/vi/nut.po
index 6a27af6661a98ab614d6892a1162897a673df1fd..23e18513fa42527940d48b97f3f075bb4723105f 100644 (file)
--- a/applications/luci-app-nut/po/vi/nut.po
+++ b/applications/luci-app-nut/po/vi/nut.po
@@ -237,7 +237,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr ""
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/zh-cn/nut.po b/applications/luci-app-nut/po/zh-cn/nut.po
index 8d8f71f873eb9be38909225676ec8cf8bc89286c..87f8d21185ca2b6ba5c58a801c45ec1ff6c3bee3 100644 (file)
--- a/applications/luci-app-nut/po/zh-cn/nut.po
+++ b/applications/luci-app-nut/po/zh-cn/nut.po
@@ -240,7 +240,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr "刷新 UPS 状态之间的最长时间（秒）"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr "最大重试次数"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-nut/po/zh-tw/nut.po b/applications/luci-app-nut/po/zh-tw/nut.po
index 6d0e07a5aee38467b14e6e19a74b4f00eda7c6d0..88203ff88b1c48585d1c7a94fb87e0ed96e1c7ee 100644 (file)
--- a/applications/luci-app-nut/po/zh-tw/nut.po
+++ b/applications/luci-app-nut/po/zh-tw/nut.po
@@ -241,7 +241,7 @@ msgid "Maximum time in seconds between refresh of UPS status"
 msgstr "重新整理 UPS 狀態之間的最長時間（秒）"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
-msgid "Maxium Retries"
+msgid "Maximum Retries"
 msgstr "最大重試次數"
 
 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158

diff --git a/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
index 396dedd4a3a92a25accb53a8a6776883c1e645f2..6194a18dcaf5d077864bc606093b865f67978e3d 100644 (file)
--- a/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
+++ b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
@@ -17,35 +17,14 @@ local e = s:taboption("general", Flag, "enable", translate("Enable server"))
 e.rmempty = false
 e.default = "1"
 
-local o_sha = s:taboption("general", DummyValue, "sha_hash", translate("Server's certificate SHA1 hash"),
-                         translate("That value should be communicated to the client to verify the server's certificate"))
 local o_pki = s:taboption("general", DummyValue, "pkid", translate("Server's Public Key ID"),
-                         translate("An alternative value to be communicated to the client to verify the server's certificate; this value only depends on the public key"))
+                         translate("The value to be communicated to the client to verify the server's certificate; this value only depends on the public key"))
 
-local fd = io.popen("/usr/bin/certtool -i --infile /etc/ocserv/server-cert.pem", "r")
+local fd = io.popen("/usr/bin/certtool --hash sha256 --key-id --infile /etc/ocserv/server-cert.pem", "r")
 if fd then local ln
-       local found_sha = false
-       local found_pki = false
-       local complete = 0
-       while complete < 2 do
-               local ln = fd:read("*l")
-               if not ln then
-                       break
-               elseif ln:match("SHA%-?1 fingerprint:") then
-                       found_sha = true
-               elseif found_sha then
-                       local hash = ln:match("([a-f0-9]+)")
-                       o_sha.default = hash and hash:upper()
-                       complete = complete + 1
-                       found_sha = false
-               elseif ln:match("Public Key I[Dd]:") then
-                       found_pki = true
-               elseif found_pki then
-                       local hash = ln:match("([a-f0-9]+)")
-                       o_pki.default = hash and "sha1:" .. hash:upper()
-                       complete = complete + 1
-                       found_pki = false
-               end
+       local ln = fd:read("*l")
+       if ln then
+               o_pki.default = "sha256:" .. ln
        end
        fd:close()
 end

diff --git a/applications/luci-app-ocserv/po/bg/ocserv.po b/applications/luci-app-ocserv/po/bg/ocserv.po
index f38d4128515087040bab7ce2f9ede65bcee3ddb2..362fabd6abd798057311b0c6b164240e73e586d0 100644 (file)
--- 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 da00b7c34f4dc3157514e7057a58abd77b7dba50..d861657f12e568ae404c6b44f436b76bd68f9295 100644 (file)
--- 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 2a578bff00fac2b1cac61e5a4e535459b773408a..2eb5c2bec7bbfaf638cbd775a2077aed4a4a62bf 100644 (file)
--- 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 "Max klientů"
 
-#: 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 9a151e96d1a63f685fbd3f9fee528a8e0499dd67..ed54302f8d98391dfb7db8322053935e56619c6d 100644 (file)
--- 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 257b766d427474f35dac24374c4fa210deb774ff..a4093786981f4267b1314023070171e8106b9411 100644 (file)
--- 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 dfad1d98e8cdc39c982365da2c85f0cb29bd64bf..e2089fec8098396b323505d42bec06e0096dcc93 100644 (file)
--- 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 eeebaae9fbdd4cbe1e4ab47fc9cfe185ce190c1c..14855db690de5a2794a23167f04748f12c63544b 100644 (file)
--- 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 a123561599dd1739e6ca7fa5bee761a7f333d38a..b08444768fbac42aa9c44abb86338ed87094a9f6 100644 (file)
--- 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\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 "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 ""
 
-#: 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 8bdd803c4fca6ee661286176dc902a36100fa318..63c014b986e69dbc176852c2a5a21ac01c7f7e99 100644 (file)
--- 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 e0f3b718016f978c4be632be872160559c86e984..d4499a41f544bacfe87939514743b9b15d53a5bf 100644 (file)
--- 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 07ff0693761cbda26c8935bda020584607428866..ed92acf6fc831b5efb88566148ff9a24a4c26dac 100644 (file)
--- 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\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/"
@@ -58,12 +58,12 @@ msgstr "Titkosító"
 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 "DNS-kiszolgálók"
 
-#: 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 "Halott partner felismerésének ideje (másodperc)"
@@ -78,19 +78,19 @@ 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 ""
 "A sablon szerkesztése, amely az ocserv beállítások előállításához lesz "
 "használva."
 
-#: 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 "UDP engedélyezése"
 
-#: 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 "
@@ -99,12 +99,12 @@ msgstr ""
 "Az UDP csatorna támogatásának engedélyezése. Ezt engedélyezni kell, hacsak "
 "nem tudja, hogy mit csinál"
 
-#: 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 "Tömörítés engedélyezése"
 
-#: 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 "Proxy ARP engedélyezése"
 
@@ -113,7 +113,7 @@ msgstr "Proxy ARP engedélyezése"
 msgid "Enable server"
 msgstr "Kiszolgáló engedélyezése"
 
-#: 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 "Támogatás engedélyezése a CISCO AnyConnect ügyfelekhez"
@@ -141,20 +141,20 @@ msgstr "Azonosító"
 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-cím"
 
-#: 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 "Legtöbb ügyfél"
 
-#: 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 "Legtöbb azonos ügyfél"
@@ -163,7 +163,7 @@ msgstr "Legtöbb azonos ügyfél"
 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 "Hálózati maszk (vagy IPv6-előtag)"
@@ -179,17 +179,17 @@ msgstr "OpenConnect VPN"
 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 "Megjósolható IP-k"
 
-#: 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 "
@@ -204,7 +204,7 @@ msgstr ""
 "rendelkezik, akkor használja a 192.168.1.192/26 címet a felső 62 cím "
 "lefoglalásához."
 
-#: 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 "Útválasztási táblázat"
@@ -213,6 +213,11 @@ msgstr "Útválasztási táblázat"
 msgid "Server Settings"
 msgstr "Kiszolgáló beállításai"
 
+<<<<<<< HEAD
+#: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
+msgid "Server's Public Key ID"
+msgstr ""
+=======
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:22
 msgid "Server's Public Key ID"
 msgstr "A kiszolgáló nyilvános kulcsának azonosítója"
@@ -220,12 +225,15 @@ msgstr "A kiszolgáló nyilvános kulcsának azonosítója"
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
 msgid "Server's certificate SHA1 hash"
 msgstr "A kiszolgáló tanúsítványának SHA1 kivonata"
+>>>>>>> weblate/master
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:73
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:58
 msgid "Status"
 msgstr "Állapot"
 
+<<<<<<< HEAD
+=======
 #: 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 "
@@ -234,11 +242,12 @@ msgstr ""
 "Az értéket közölni kell az ügyféllel a kiszolgáló tanúsítványának "
 "ellenőrzéséhez"
 
+>>>>>>> weblate/master
 #: 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 "Az ügyfeleknek biztosított DNS-kiszolgálók. Lehet IPv6 vagy 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"
@@ -246,7 +255,7 @@ msgstr ""
 "Az ügyfeleknek biztosított DNS-kiszolgálók. Lehet IPv6 vagy IPv4. Jellemzően "
 "fel kell vennie ennek az eszköznek a címét"
 
-#: 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 "
@@ -256,7 +265,7 @@ msgstr ""
 "hálózatnak kell lennie, amelyek különböznek a LAN címeitől, hacsak proxy ARP "
 "nincs engedélyezve. Hagyja üresen az automatikus beállítás kísérletéhez."
 
-#: 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."
@@ -264,12 +273,12 @@ msgstr ""
 "Az ügyfeleknek biztosított IPv6 alhálózat címe. Hagyja üresen az automatikus "
 "beállítás kísérletéhez."
 
-#: 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 "A hozzárendelt IP-k meghatározottan lesznek kiválasztva"
 
-#: 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 "
@@ -284,11 +293,11 @@ msgstr ""
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr "A tűzfalzóna, amelyhez a VPN ügyfelek be lesznek állítva"
 
-#: 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 fenti alhálózat maszkja."
 
-#: 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 "
@@ -299,11 +308,17 @@ msgstr ""
 "útvonalakat, a kiszolgáló csak a megfelelőt fogja küldeni. Hagyja üresen egy "
 "alapértelmezett útvonal beállításához"
 
-#: 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 "Ugyanaz az UDP és TCP port lesz használva"
 
+#: 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 "Nincsenek aktív felhasználók."
@@ -317,7 +332,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 "Felhasználó hitelesítése"
@@ -330,20 +345,20 @@ msgstr "Felhasználó beállításai"
 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 ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr> hálózati maszk"
 
-#: 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 ""
 "VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr> hálózati címe"
 
-#: 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"
@@ -358,7 +373,7 @@ msgstr "VPN IP"
 msgid "VPN IP Address"
 msgstr "VPN IP-címe"
 
-#: 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 136765c1885a6dbe47d2dcdb3b94c8393495c2cc..c1d696435fd2952c4d90eb062d47ed0189917689 100644 (file)
--- 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 91a78127b556f66682db4c0f7f15cb4687e4b1d6..09348c1c62c4f2772dedd3a23202ac285714400a 100644 (file)
--- 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 2f24691b126b023bebfe36090c6515cda52db932..26f1c9a4185ed471de64a39ca9df25d87845c347 100644 (file)
--- 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 78ad5ca03d7d9bf8c7390c99a8c8e6968458828e..261d95de6790397787357e12954175d62632f440 100644 (file)
--- 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\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 46f41d9103140b63f59cc07e3b795e2ac2ce638f..0433407d94feb0f371b7df9e27716c291266fef7 100644 (file)
--- a/applications/luci-app-ocserv/po/ms/ocserv.po
+++ b/applications/luci-app-ocserv/po/ms/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 "Mengumpul 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/nb_NO/ocserv.po b/applications/luci-app-ocserv/po/nb_NO/ocserv.po
index 07276f38c7bb0041259d984839c6bfc5e8af03e9..ad3cbb39af1df78296864938353366690f733855 100644 (file)
--- 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 fb1b8e005978b62a72ed7b7d73c1fdf559bc71b8..3c1f77777076876e771b1866e6d5ee089955ccd6 100644 (file)
--- 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 153ecbf46fff57931d43a456130b776d9de4aa0a..0721b3d4a14cb67381d9ab9fecb06844f7611dbc 100644 (file)
--- 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 d67fe5a7d5a155c926689c09da228c27c6fa9f40..9276d3b313656f8030cc90e9a5c6a3d439b32c5a 100644 (file)
--- 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 692eb3c8a203fc7f22eec94dc84bdf67eef8b705..adabbc6e6cb0aac4e21fae36190852b49e4cf4e9 100644 (file)
--- 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 "Utilizatori activi"
 
-#: 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 "Colectare date..."
 
-#: 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 "Servere 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 ""
@@ -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 3327ab18a1592dec7030eae60a894c57bf973d75..744c66294ddd19468517ad6af6790fd6ecb7c2bb 100644 (file)
--- a/applications/luci-app-ocserv/po/ru/ocserv.po
+++ b/applications/luci-app-ocserv/po/ru/ocserv.po
@@ -11,7 +11,7 @@ msgstr ""
 "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10\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 "Состояние"
 
-#: 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/sk/ocserv.po b/applications/luci-app-ocserv/po/sk/ocserv.po
index 4a59cca079531c8a3b9e895644b52db05dd48e72..f9395264905b04599c0866ec7480d15a6f1b8a48 100644 (file)
--- 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 18dc5b0a2b1a595316713e09df901b2534f1f2e0..9562721bc89565dfede54675ad9c165e2b377db9 100644 (file)
--- 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 8083170ce0dc50d52b68558d3d994236579bea2d..2e96fb3fe44d19a2352820ac1258ce9aa9bc75c2 100644 (file)
--- 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 c68633254abab0207164ec418f77c5d9f445b2a1..b966990c86efd2e92168f9ce1210acfafb42bf36 100644 (file)
--- 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 78beba3b385a904e256342ff202b1b6947e12786..81a7fb71a20b33c380f69e1a850eb40135b92aa2 100644 (file)
--- 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 3fe78350317a410a4e9c9dbf813dcc42aaf6f203..6c472d9eda8dc76335c6052a0097b6cac35f26a8 100644 (file)
--- 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 9c08788933526b3e748d24908f838192ecce6e93..c42176376871185f173c802b4b0207946d023b88 100644 (file)
--- 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\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/"
@@ -31,7 +31,6 @@ msgid ""
 "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/user-config.lua:64
 msgid "AnyConnect client compatibility"
 msgstr "AnyConnect 客户端兼容性"
@@ -54,12 +53,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 "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 "对等体失效检测时间（秒）"
@@ -74,29 +73,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 "编辑用于生成 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 "启用 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 "
 "are doing"
 msgstr "启用 UDP 通道支持；除非您知道自己在做什么，否则必须启用它"
 
-#: 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 "启用代理 ARP"
 
@@ -105,7 +104,7 @@ msgstr "启用代理 ARP"
 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 "启用对 CISCO AnyConnect 客户端的支持"
@@ -133,20 +132,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 "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 "最大客户端数量"
 
-#: 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
 #, fuzzy
 msgid "Max same clients"
@@ -156,7 +155,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 "网络掩码（或 IPv6 前缀）"
@@ -173,17 +172,17 @@ msgstr "OpenConnect VPN"
 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 "可预测的 IP"
 
-#: 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 "
@@ -194,7 +193,7 @@ msgstr ""
 "从 LAN 子网向客户端提供地址；如果启用，下面的网络必须是 LAN 的子网。请注意，指定子网的第一个地址将由 ocserv 保留，因此不应使用。"
 "如果您的 LAN 网络范围是 192.168.1.0/24，请使用 192.168.1.192/26 保留前面的 62 个地址。"
 
-#: 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 "路由表"
@@ -203,7 +202,7 @@ msgstr "路由表"
 msgid "Server Settings"
 msgstr "服务器设置"
 
-#: 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"
 
@@ -226,32 +225,32 @@ msgstr "该值应传达给客户端以验证服务器的证书"
 msgid "The DNS servers to be provided to clients; can be either IPv6 or IPv4"
 msgstr "要提供给客户端的 DNS 服务器；可以是 IPv6 或 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"
 msgstr "要提供给客户端的 DNS 服务器；可以是 IPv6 或 IPv4。通常，您应该包括此设备的地址"
 
-#: 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 "要提供给客户端的 IPv4 子网地址；除非启用代理 ARP，否则这应该是一些与 LAN 地址不同的专用网络。留空以尝试自动配置。"
 
-#: 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 "要提供给客户端的 IPv6 子网地址；留空以尝试自动配置。"
 
-#: 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
 #, fuzzy
 msgid "The assigned IPs will be selected deterministically"
 msgstr "分配的 IP 将确定性地被选中"
 
-#: 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 "
@@ -263,11 +262,11 @@ msgstr "用户的身份验证方法。最简单的是单个用户名-密码对
 msgid "The firewall zone that the VPN clients will be set to"
 msgstr "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 "上面子网的掩码。"
 
-#: 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 "
@@ -275,12 +274,18 @@ msgid ""
 "default route"
 msgstr "提供给客户端的路由表；您可以混合使用 IPv4 和 IPv6 路由，服务器将只发送适当的路由。留空以设置默认路由"
 
-#: 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
 #, fuzzy
 msgid "The same UDP and TCP ports will be used"
 msgstr "将使用相同的 UDP 和 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
 #, fuzzy
 msgid "There are no active users."
@@ -295,7 +300,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
 #, fuzzy
 msgid "User Authentication"
@@ -309,18 +314,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 "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 "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"
@@ -334,7 +339,7 @@ msgstr "VPN IP"
 msgid "VPN IP Address"
 msgstr "VPN IP 地址"
 
-#: 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 87ca0b2c98916960d6b6f7413b9223a4c48cabd6..869de15e28d0dd841350c5cb3ba17914c69f2ea1 100644 (file)
--- a/applications/luci-app-ocserv/po/zh-tw/ocserv.po
+++ b/applications/luci-app-ocserv/po/zh-tw/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 ""
 
-#: 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-omcproxy/po/bg/omcproxy.po b/applications/luci-app-omcproxy/po/bg/omcproxy.po
index 5c3a22e424c17934135911a0c606c5e9889938a5..acf972feabb64843b977d0e8e49076bb89587f9c 100644 (file)
--- 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 459376de67968a3ddb32f0a35f2a940c140f818e..70229b5e0cf50f06f428daeb786861797d04842c 100644 (file)
--- 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 68620cb6ffff660228b039e6edb2ef11ffdb1b8d..53bb28ca218af67563e5d195196556af7010a2e7 100644 (file)
--- 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 61b531d809000872c1a400260bf93ac360c8d04d..b2e61359dff3ecf559b8036d7d4485b1df9e6040 100644 (file)
--- 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 268f867943ad84de98d0eeec17a992368a86e685..94f54b85939e5d98764f68a25dbed2e4bfbe6d5f 100644 (file)
--- 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 fcc3bb28f978a77942341874cefc6714346b2625..40c04395c3cb6ba6dc0a317fa058a3f8ec3601b9 100644 (file)
--- 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 108802f1ef6c84f62cd8f116e40d0a18cbf8517e..c69954b07c742b3c96a6617f30b304a307108139 100644 (file)
--- 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 bf2bd4a8a82d15baf4fc556eb76c23386dad1912..5ebd51d4e6436b7b93863bf93b3ff765d9d4fa69 100644 (file)
--- a/applications/luci-app-omcproxy/po/fr/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/fr/omcproxy.po
@@ -10,69 +10,69 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10\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 "Ajouter une instance"
 
-#: 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 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 et MLDv2 intégré"
 
-#: 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 ""
 "Portée de multidiffusion minimale vers le proxy (affecte uniquement la "
 "multidiffusion 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 "Instance 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 "Portée"
 
-#: 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 "D'où vient le 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 "Où va le 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 "Par défaut"
 
-#: 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 "organization-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 "Domaine"
 
-#: 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/he/omcproxy.po b/applications/luci-app-omcproxy/po/he/omcproxy.po
index 06e1e5f662dc06851473b3ac90a624413a149633..1583d87b0f2fe326b2b6a47ec66b906b37ae0508 100644 (file)
--- 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 6f65af0967c36a98155506d9e9ecdabc0d5f9dcc..9cc7c220b84470a509a4b784983ced3bf9e5f450 100644 (file)
--- 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 5ab04f74e82f49e321985c164bf86c3678f6d9df..329b5bb153bdaa89a45ac8ca103547cab53d123d 100644 (file)
--- a/applications/luci-app-omcproxy/po/hu/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/hu/omcproxy.po
@@ -10,69 +10,69 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\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éldány hozzáadása"
 
-#: 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 "Befelé jövő kapcsolat csatolója"
 
-#: 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 "Beágyazott IGMPv3 és MLDv2 proxy"
 
-#: 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 ""
 "Legkisebb proxyzandó csoportcímzési hatókör (csak az IPv6 csoportcímzést "
 "érinti)"
 
-#: 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 "Proxypéldány"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:16
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
 msgstr "Hatókör"
 
-#: 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 "Kifelé menő kapcsolat csatolója"
 
-#: 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 "Honnan jön a csoportcímzés?"
 
-#: 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 "Hová megy a csoportcímzés?"
 
-#: 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 "adminisztrátorszintű"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:18
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
 msgstr "alapértelmezett"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:19
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
 msgstr "globális"
 
-#: 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 "szervezetszintű"
 
-#: htdocs/luci-static/resources/view/omcproxy/overview.js:23
+#: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
 msgstr "tartomány"
 
-#: 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 "oldalszintű"

diff --git a/applications/luci-app-omcproxy/po/it/omcproxy.po b/applications/luci-app-omcproxy/po/it/omcproxy.po
index 33b7ec9d59b4e545ad7ae16f2658c89280b3674b..fd32cf08bcc0c39ab5b27e21c64e73b738790900 100644 (file)
--- 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 6864da4a110a1268c72058e507353d7509f8f504..3bfe52442a70d2ba72d7cb483d0bf9db270dfbe3 100644 (file)
--- 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 b2e16bdb83ad133422f97455b112e8fa199782f8..3d0d2f10fa71b9f31e42ce9ccb3d5ff296a3f181 100644 (file)
--- 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 5a62ba22fe5be3ce6fb454ab7482d1a0f10dda15..6d7a12da9aceae18dc51e870c791fddab7fc28d5 100644 (file)
--- a/applications/luci-app-omcproxy/po/mr/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/mr/omcproxy.po
@@ -10,68 +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 "उदाहरण जोडा"
 
-#: 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 प्रॉक्सी"
 
-#: 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 "साइट-स्थानिक"

diff --git a/applications/luci-app-omcproxy/po/ms/omcproxy.po b/applications/luci-app-omcproxy/po/ms/omcproxy.po
index 063fdd672a3638d50584f7128a0408b8efb469b5..7005e0fe6ecd91046903a7f7a993fee029ec6340 100644 (file)
--- 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 c558b3f4e5df852c9f3d5251d426335c3276d478..1157e6c8affb5890023b1613cb8c8d87237bf539 100644 (file)
--- 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 9655d51519a651a379cbbb1b1de741a485dfc12f..da5d68d2a7b96192ae47f027e30bb103c0ff75e7 100644 (file)
--- 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 645eb8f8e53a7118958428504d516df2a04ee17f..f7af81ef3f2593fd0c3fb7a34a900cd15c52d805 100644 (file)
--- 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 cf3c19b959209387a34614118a10d9abc12ba79a..6332276c54192e58f32930b0bd033519c8add0f1 100644 (file)
--- 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 7e2e64684b560e8c3eecf2436be5fb642121d9f7..dd6428a9f42104c6baeaf7c1a806b0291819d8d7 100644 (file)
--- a/applications/luci-app-omcproxy/po/ro/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/ro/omcproxy.po
@@ -11,67 +11,67 @@ msgstr ""
 "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 "Adaugă instanţă"
 
-#: 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 3cb0280a8929cef478c83305a07a8a3d074ef500..9b02dbef980a9928f9144bbdf1214bc96d1331be 100644 (file)
--- a/applications/luci-app-omcproxy/po/ru/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/ru/omcproxy.po
@@ -11,67 +11,67 @@ msgstr ""
 "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10\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 e9ea0b9713de9059bd24fe17c65136df647e2738..65ba1093221ecef31be2293623eade026ef95160 100644 (file)
--- 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 5eb679b3ba92478aa50a9d2e18408d5c19772f0c..f0674ff532fec5f49dafdfa1f63feac133241eb3 100644 (file)
--- a/applications/luci-app-omcproxy/po/sv/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/sv/omcproxy.po
@@ -10,67 +10,67 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\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 "standard"
 
-#: 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 ab19dfb26487162633b28a42f385203a8f29e256..0bbaa295be0f1ed2e9f21d96eb82fad904d95551 100644 (file)
--- 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 bdc68f22fe8773ce317fd91ec0068dab08f93ca9..ac64906ebba133e01b14b313907e110a4ed0bebd 100644 (file)
--- 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 e030564a30a694205d006fd68a4c20140a3fd01a..80ca460771bc5399b717e2238e3570046945b995 100644 (file)
--- 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 38e3b0d262df0cb6c0e1f35b8e937ab9a4c74e66..4ea7f36607ee2fc159dd0f9dda022b8fe33f3db1 100644 (file)
--- 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 ed47bcbb45d262aafb357e0c4eb3054023d540da..1b4bbadf9e53128c1f430df03afe5d0d8270475a 100644 (file)
--- 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 4c08fa2f3a9513da2d15a105d496f2e3cbc12f10..9eda3bd89d300dff800616a8363464db37903611 100644 (file)
--- 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/luasrc/controller/opkg.lua b/applications/luci-app-opkg/luasrc/controller/opkg.lua
index 29c9a0864542842173e60f450db963792a5f2202..ebdcf1b09c82a584491934750f50a239c5f808b3 100644 (file)
--- a/applications/luci-app-opkg/luasrc/controller/opkg.lua
+++ b/applications/luci-app-opkg/luasrc/controller/opkg.lua
@@ -3,14 +3,6 @@
 
 module("luci.controller.opkg", package.seeall)
 
-function index()
-       entry({"admin", "system", "opkg"}, template("opkg"), _("Software"), 30)
-       entry({"admin", "system", "opkg", "list"}, call("action_list")).leaf = true
-       entry({"admin", "system", "opkg", "exec"}, post("action_exec")).leaf = true
-       entry({"admin", "system", "opkg", "statvfs"}, call("action_statvfs")).leaf = true
-       entry({"admin", "system", "opkg", "config"}, post_on({ data = true }, "action_config")).leaf = true
-end
-
 function action_list(mode)
        local util = require "luci.util"
        local cmd
@@ -26,7 +18,7 @@ function action_list(mode)
                        fd:close()
                end
 
-               if not lists_dir or #lists_dir == "" then
+               if not lists_dir or #lists_dir == 0 then
                        lists_dir = "/tmp/opkg-lists"
                end
 

diff --git a/applications/luci-app-opkg/po/bg/opkg.po b/applications/luci-app-opkg/po/bg/opkg.po
index fbce3f6b7d967f793714c34c9bc70763de56fcc0..0063408dabd684b51d467bba5ad2076e4c183d5e 100644 (file)
--- 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 c6455203569b79e8cb6abe33281d846147f20f81..9dc13b9c7f17fde61940d7d3d42f10458b3d4d73 100644 (file)
--- 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 a48ed5d45474ec43c6e1976046c72cd2bcd2607f..51925cc3c6eef3a37d63a0e98106d23a5411ddb6 100644 (file)
--- 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 8c38a25a25b5b95c32582b10f3c3471be91c74b9..0736001b315687eb3074c26baa467906a6b24047 100644 (file)
--- 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 710042213d058aea564fb3f0f7ada074e4a41988..1c999739a5df0cd59c5717835b4a29abf3d998b7 100644 (file)
--- 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 69b761842f51eda184bd2745c8b7349c5c3e4bfb..f4dcb3aadfb1956d9100bc9023466fafbf640bd3 100644 (file)
--- 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 9a5b6cd2a4aaf5841b391377406ae8689a22fabe..6fe08e57650219b04aa0aa1204099093ea554ba2 100644 (file)
--- 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 6bb9fd6898602b4ffa32e7aea51ebe8cc373b5af..ab75465779cb70066b94fcb802f343f0c2eff50c 100644 (file)
--- 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 31106b62e241ebd0ab5af7189652c89017c98473..6172ae7c615e240ad53144022f390f82e8e03176 100644 (file)
--- 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 8b1b6bbb958e63e72811dc3fea77bd6f892ddcc3..9ac127807b06087d9b2d82ac5f7041b7ea17faed 100644 (file)
--- 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 1e6c1ed59f334300cb244cc49560eeb30b89e95e..d9f2e0bb70a7d4a795741b0d7da44509c38b171d 100644 (file)
--- 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 1dcfe41ea4fa6842d3a4a0abb7fa74207d34299f..54964da915ba54a5403e2031c2968e63dd7f8e81 100644 (file)
--- 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 cc44ae6d64770f1464835472d4553bf3028d9210..ed28f6e4a7d82e0bc79cef02fd9ef72c2caf1b1d 100644 (file)
--- 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 6178e013db94df5517ed6607f0145a669cbbacec..b568b2fde7d880885cd41acda2a1c1e7320c6edf 100644 (file)
--- 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 748fb3e90aca3b7e13905b85aa982ca5afbdc3bd..bf53f20779a061dc6217cc97ea7969dcba641a14 100644 (file)
--- 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 4bf0848fbcbd5f04b054c2c544d7e74dbdc3ba5f..f2ced19baa36c08b7ea9790bd2dac8ebd387ad10 100644 (file)
--- 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 bc9797bb534f9eb5c28a7040e881b532926a4152..60ea006766a19dc7145319a2c2690ae7845f362c 100644 (file)
--- 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 4fa4847e4c030c9cc8cc4e3a0d3656162fc96bbb..7add0eafe5b0c907ae55109175bf37c6449a2dd8 100644 (file)
--- 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 861025b380c9ee6c04466aa32760b07e9da8d492..80447a6d13d9c3121b38da5b3c53da4e695e70f5 100644 (file)
--- 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 b231cfe4030c6c93a89dd3b6d8770e9bf69535ef..d5cb5fd3683ba661af05a209760c0784b6cb0b29 100644 (file)
--- 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 81d0e695766d1cc729bca92c527027192e6c27ef..60144f0c3954f8168deff0436771fee928327a0f 100644 (file)
--- 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 9ab88eecdd52c18362263e93739030e2c6f513fe..8efeb0195ffb25198678340798c59f9fa2dd4717 100644 (file)
--- 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 38111646dce68393c44843a5cac1fcda96d8b371..3ee8eeb0c67bfc653da2395809a4efa65dc401bb 100644 (file)
--- 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 5fc0a0c7cb8a6cca31792cab06464f354e584c29..d51b03c3461f8daefdc9c80c6cf6dfef4d765ba4 100644 (file)
--- 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 0eef92a477d3dc18269c2e0e4a3623ba117a4335..f38dce57c92dec4bd7de91b6645ad57f7cce837b 100644 (file)
--- 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 a913924e0103b7c1cfee6afb2e325025d73b99b2..4246b3ee42d667baaee10c1530410bf8574ea187 100644 (file)
--- 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 7d6138d96ed151b53e065a74392ec510561ebd2a..487493b047f985e4abf99c87caf49e84e4c45414 100644 (file)
--- 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 6829a535b9859e84bc2a6cc5c86048b4be80ee78..9c18fb32d342fa922290fb8c0720b31bea91ecf2 100644 (file)
--- 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 f902addcb2372ee6b88925cfead75a3a4b300bee..c2f2cf5c7c64d3c760e97b02bfe67c7536581396 100644 (file)
--- 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 a7efc8fdc59d3c701d6d9cb8ee980d41dfc8b68a..50ad801a047386aac5dd6d0dab1949c2e77b07b4 100644 (file)
--- a/applications/luci-app-opkg/po/zh-tw/opkg.po
+++ b/applications/luci-app-opkg/po/zh-tw/opkg.po
@@ -256,8 +256,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/root/usr/share/luci/menu.d/luci-app-opkg.json b/applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json
new file mode 100644 (file)
index 0000000..9356b58
--- /dev/null
+++ b/applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json
@@ -0,0 +1,44 @@
+{
+       "admin/system/opkg": {
+               "title": "Software",
+               "order": 30,
+               "action": {
+                       "type": "template",
+                       "path": "opkg"
+               }
+       },
+
+       "admin/system/opkg/list/*": {
+               "action": {
+                       "type": "call",
+                       "module": "luci.controller.opkg",
+                       "function": "action_list"
+               }
+       },
+
+       "admin/system/opkg/exec/*": {
+               "action": {
+                       "type": "call",
+                       "post": true,
+                       "module": "luci.controller.opkg",
+                       "function": "action_exec"
+               }
+       },
+
+       "admin/system/opkg/statvfs/*": {
+               "action": {
+                       "type": "call",
+                       "module": "luci.controller.opkg",
+                       "function": "action_statvfs"
+               }
+       },
+
+       "admin/system/opkg/config/*": {
+               "action": {
+                       "type": "call",
+                       "post": { "data": true },
+                       "module": "luci.controller.opkg",
+                       "function": "action_config"
+               }
+       }
+}

diff --git a/applications/luci-app-pagekitec/root/etc/uci-defaults/40_luci-pagekitec b/applications/luci-app-pagekitec/root/etc/uci-defaults/40_luci-pagekitec
index 95d7e9ec8f6d5d9bfff2efe1882dea5ba0781d14..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100755 (executable)
--- a/applications/luci-app-pagekitec/root/etc/uci-defaults/40_luci-pagekitec
+++ b/applications/luci-app-pagekitec/root/etc/uci-defaults/40_luci-pagekitec
@@ -1,11 +1,4 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@pagekitec[-1]
-       add ucitrack pagekitec
-       set ucitrack.@pagekitec[-1].init=pagekitec
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-shadowsocks-libev/root/etc/uci-defaults/40_luci-shadowsocks-libev b/applications/luci-app-shadowsocks-libev/root/etc/uci-defaults/40_luci-shadowsocks-libev
index 4cc9abcee5e3c92c650a5fa95947ff9f1fa03d82..10e1c702ff5d599508795226a442224be1c01408 100644 (file)
--- a/applications/luci-app-shadowsocks-libev/root/etc/uci-defaults/40_luci-shadowsocks-libev
+++ b/applications/luci-app-shadowsocks-libev/root/etc/uci-defaults/40_luci-shadowsocks-libev
@@ -1,12 +1,5 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@shadowsocks-libev[-1]
-       add ucitrack shadowsocks-libev
-       set ucitrack.@shadowsocks-libev[-1].init=shadowsocks-libev
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 mkdir -p /etc/shadowsocks-libev
 /etc/init.d/rpcd reload

diff --git a/applications/luci-app-shairplay/root/etc/uci-defaults/40_luci-shairplay b/applications/luci-app-shairplay/root/etc/uci-defaults/40_luci-shairplay
index efc8a89bb0c74d319f140f9a196747a44bd56bc4..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100644 (file)
--- a/applications/luci-app-shairplay/root/etc/uci-defaults/40_luci-shairplay
+++ b/applications/luci-app-shairplay/root/etc/uci-defaults/40_luci-shairplay
@@ -1,12 +1,4 @@
 #!/bin/sh
 
-# needed for "Save and Apply" to restart shairplay
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@shairplay[-1]
-       add ucitrack shairplay
-       set ucitrack.@shairplay[-1].init="shairplay"
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-travelmate/root/etc/uci-defaults/40_luci-travelmate b/applications/luci-app-travelmate/root/etc/uci-defaults/40_luci-travelmate
index f7676774a174668d56d9fa6a9a0242dd15950663..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100755 (executable)
--- a/applications/luci-app-travelmate/root/etc/uci-defaults/40_luci-travelmate
+++ b/applications/luci-app-travelmate/root/etc/uci-defaults/40_luci-travelmate
@@ -1,11 +1,4 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@travelmate[-1]
-       add ucitrack travelmate
-       set ucitrack.@travelmate[-1].init=travelmate
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-udpxy/root/etc/uci-defaults/40_luci-udpxy b/applications/luci-app-udpxy/root/etc/uci-defaults/40_luci-udpxy
index e93c07880724d8a6c8c62b36101ec677a9099ac5..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100644 (file)
--- a/applications/luci-app-udpxy/root/etc/uci-defaults/40_luci-udpxy
+++ b/applications/luci-app-udpxy/root/etc/uci-defaults/40_luci-udpxy
@@ -1,12 +1,4 @@
 #!/bin/sh
 
-# needed for "Save and Apply" to restart udpxy
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@udpxy[-1]
-       add ucitrack udpxy
-       set ucitrack.@udpxy[-1].init="udpxy"
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-unbound/root/etc/uci-defaults/60_luci-unbound b/applications/luci-app-unbound/root/etc/uci-defaults/60_luci-unbound
index c2ac8c93b66bcf7a91f25beac3b2c5da71382311..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100644 (file)
--- a/applications/luci-app-unbound/root/etc/uci-defaults/60_luci-unbound
+++ b/applications/luci-app-unbound/root/etc/uci-defaults/60_luci-unbound
@@ -1,12 +1,4 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-  delete ucitrack.@unbound[-1]
-  add ucitrack unbound
-  set ucitrack.@unbound[-1].init=unbound
-  commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0
-

diff --git a/applications/luci-app-vnstat/root/etc/uci-defaults/40_luci-vnstat b/applications/luci-app-vnstat/root/etc/uci-defaults/40_luci-vnstat
index fa204b3b48f71d85600c3d8340deec23d47d233a..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100755 (executable)
--- a/applications/luci-app-vnstat/root/etc/uci-defaults/40_luci-vnstat
+++ b/applications/luci-app-vnstat/root/etc/uci-defaults/40_luci-vnstat
@@ -1,11 +1,4 @@
 #!/bin/sh
 
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@vnstat[-1]
-       add ucitrack vnstat
-       set ucitrack.@vnstat[-1].init=vnstat
-       commit ucitrack
-EOF
-
 rm -f /tmp/luci-indexcache
 exit 0

diff --git a/applications/luci-app-vpn-policy-routing/Makefile b/applications/luci-app-vpn-policy-routing/Makefile
new file mode 100644 (file)
index 0000000..8dd26c6
--- /dev/null
+++ b/applications/luci-app-vpn-policy-routing/Makefile
@@ -0,0 +1,17 @@
+# Copyright 2017-2019 Stan Grishin (stangri@melmac.net)
+# This is free software, licensed under the GNU General Public License v3.
+
+include $(TOPDIR)/rules.mk
+
+PKG_LICENSE:=GPL-3.0-or-later
+PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
+
+LUCI_TITLE:=VPN Policy-Based Routing Service Web UI
+LUCI_DESCRIPTION:=Provides Web UI for vpn-policy-routing service.
+LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpn-policy-routing
+LUCI_PKGARCH:=all
+PKG_RELEASE:=67
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature

diff --git a/applications/luci-app-vpn-policy-routing/luasrc/controller/vpn-policy-routing.lua b/applications/luci-app-vpn-policy-routing/luasrc/controller/vpn-policy-routing.lua
new file mode 100644 (file)
index 0000000..0c8c31e
--- /dev/null
+++ b/applications/luci-app-vpn-policy-routing/luasrc/controller/vpn-policy-routing.lua
@@ -0,0 +1,25 @@
+module("luci.controller.vpn-policy-routing", package.seeall)
+function index()
+       if nixio.fs.access("/etc/config/vpn-policy-routing") then
+               entry({"admin", "vpn"}, firstchild(), _("VPN"), 60).dependent=false
+               entry({"admin", "vpn", "vpn-policy-routing"}, cbi("vpn-policy-routing"), _("VPN Policy Routing"))
+               entry({"admin", "vpn", "vpn-policy-routing", "action"}, call("vpn_policy_routing_action"), nil).leaf = true
+       end
+end
+
+function vpn_policy_routing_action(name)
+       local packageName = "vpn-policy-routing"
+       if name == "start" then
+               luci.sys.init.start(packageName)
+       elseif name == "action" then
+               luci.util.exec("/etc/init.d/" .. packageName .. " reload >/dev/null 2>&1")
+       elseif name == "stop" then
+               luci.sys.init.stop(packageName)
+       elseif name == "enable" then
+               luci.util.exec("uci set " .. packageName .. ".config.enabled=1; uci commit " .. packageName)
+       elseif name == "disable" then
+               luci.util.exec("uci set " .. packageName .. ".config.enabled=0; uci commit " .. packageName)
+       end
+       luci.http.prepare_content("text/plain")
+       luci.http.write("0")
+end

diff --git a/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua b/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua
new file mode 100644 (file)
index 0000000..e6b1156
--- /dev/null
+++ b/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua
@@ -0,0 +1,379 @@
+local readmeURL = "https://github.com/openwrt/packages/tree/master/net/vpn-policy-routing/files/README.md"
+-- local readmeURL = "https://github.com/stangri/openwrt_packages/tree/master/vpn-policy-routing/files/README.md"
+
+-- function log(obj)
+--     if obj ~= nil then if type(obj) == "table" then luci.util.dumptable(obj) else luci.util.perror(obj) end else luci.util.perror("Empty object") end
+-- end
+
+local packageName = "vpn-policy-routing"
+local uci = require "luci.model.uci".cursor()
+local sys = require "luci.sys"
+local util = require "luci.util"
+local ip = require "luci.ip"
+local fs = require "nixio.fs"
+local jsonc = require "luci.jsonc"
+local http = require "luci.http"
+local nutil = require "nixio.util"
+local dispatcher = require "luci.dispatcher"
+local enabledFlag = uci:get(packageName, "config", "enabled")
+local enc
+
+local ubusStatus = util.ubus("service", "list", { name = packageName })
+if ubusStatus and ubusStatus[packageName] and 
+        ubusStatus[packageName]["instances"] and 
+        ubusStatus[packageName]["instances"]["main"] and 
+        ubusStatus[packageName]["instances"]["main"]["data"] and
+        ubusStatus[packageName]["instances"]["main"]["data"]["status"] and 
+        ubusStatus[packageName]["instances"]["main"]["data"]["status"][1] then
+       pkgGateways = ubusStatus[packageName]["instances"]["main"]["data"]["status"][1]["gateway"]
+       pkgGateways = pkgGateways and pkgGateways:gsub('\\n', '\n')
+       pkgGateways = pkgGateways and pkgGateways:gsub('\\033%[0;32m%[\\xe2\\x9c\\x93%]\\033%[0m', '✓')
+       pkgErrors = ubusStatus[packageName]["instances"]["main"]["data"]["status"][1]["error"]
+       pkgErrors = pkgErrors and pkgErrors:gsub('\\n', '\n')
+       pkgErrors = pkgErrors and pkgErrors:gsub('\\033%[0;31mERROR\\033%[0m: ', '')
+       pkgWarnings = ubusStatus[packageName]["instances"]["main"]["data"]["status"][1]["warning"]
+       pkgWarnings = pkgWarnings and pkgWarnings:gsub('\\n', '\n')
+       pkgWarnings = pkgWarnings and pkgWarnings:gsub('\\033%[0;33mWARNING\\033%[0m: ', '')
+       pkgMode = ubusStatus[packageName]["instances"]["main"]["data"]["status"][1]["mode"]
+end
+
+local pkgVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'")))
+if not pkgVersion or pkgVersion == "" then
+       pkgVersion = ""
+       pkgStatus, pkgStatusLabel = "NotFound", packageName .. " " .. translate("is not installed or not found")
+else  
+       pkgVersion = " [" .. packageName .. " " .. pkgVersion .. "]"
+end
+local pkgStatus, pkgStatusLabel = "Stopped", translate("Stopped")
+if sys.call("iptables -t mangle -L | grep -q VPR_PREROUTING") == 0 then
+       pkgStatus, pkgStatusLabel = "Running", translate("Running")
+       if pkgMode and pkgMode == "strict" then
+               pkgStatusLabel = pkgStatusLabel .. " " .. translate("(strict mode)")
+       end
+end
+
+local t = uci:get("vpn-policy-routing", "config", "supported_interface")
+if not t then
+       supportedIfaces = ""
+elseif type(t) == "table" then
+       for key,value in pairs(t) do supportedIfaces = supportedIfaces and supportedIfaces .. ' ' .. value or value end
+elseif type(t) == "string" then
+       supportedIfaces = t
+end
+
+t = uci:get("vpn-policy-routing", "config", "ignored_interface")
+if not t then
+       ignoredIfaces = ""
+elseif type(t) == "table" then
+       for key,value in pairs(t) do ignoredIfaces = ignoredIfaces and ignoredIfaces .. ' ' .. value or value end
+elseif type(t) == "string" then
+       ignoredIfaces = t
+end
+
+local lanIPAddr = uci:get("network", "lan", "ipaddr")
+local lanNetmask = uci:get("network", "lan", "netmask")
+-- if multiple ip addresses on lan interface, will be return as table of CIDR notations i.e. {"10.0.0.1/24","10.0.0.2/24"}
+if (type(lanIPAddr) == "table") then                                                                                   
+                               first = true                                                                                             
+                               for i,line in ipairs(lanIPAddr) do                                                                  
+                                                               lanIPAddr = lanIPAddr[i]                                                                    
+                                                               break                                           
+                               end                                                     
+                               lanIPAddr = string.match(lanIPAddr,"[0-9.]+")                                                            
+end          
+if lanIPAddr and lanNetmask then
+       laPlaceholder = ip.new(lanIPAddr .. "/" .. lanNetmask )
+end
+
+function is_wan(name)
+       return name:sub(1,3) == "wan" or name:sub(-3) == "wan"
+end
+
+function is_supported_interface(arg)
+       local name=arg['.name']
+       local proto=arg['proto']
+       local ifname=arg['ifname']
+
+       if name and is_wan(name) then return true end
+       if name and supportedIfaces:match('%f[%w]' .. name .. '%f[%W]') then return true end
+       if name and not ignoredIfaces:match('%f[%w]' .. name .. '%f[%W]') then
+               if type(ifname) == "table" then
+                       for key,value in pairs(ifname) do
+                               if value and value:sub(1,3) == "tun" then return true end
+                               if value and value:sub(1,3) == "tap" then return true end
+                               if value and value:sub(1,3) == "tor" then return true end
+                               if value and fs.access("/sys/devices/virtual/net/" .. value .. "/tun_flags") then return true end
+                       end
+               elseif type(ifname) == "string" then
+                       if ifname and ifname:sub(1,3) == "tun" then return true end
+                       if ifname and ifname:sub(1,3) == "tap" then return true end
+                       if ifname and ifname:sub(1,3) == "tor" then return true end
+                       if ifname and fs.access("/sys/devices/virtual/net/" .. ifname .. "/tun_flags") then return true end
+               end
+               if proto and proto:sub(1,11) == "openconnect" then return true end
+               if proto and proto:sub(1,4) == "pptp" then return true end
+               if proto and proto:sub(1,4) == "l2tp" then return true end
+               if proto and proto:sub(1,9) == "wireguard" then return true end
+       end
+end
+
+m = Map("vpn-policy-routing", translate("VPN and WAN Policy-Based Routing"))
+
+h = m:section(NamedSection, "config", packageName, translate("Service Status") .. pkgVersion)
+status = h:option(DummyValue, "_dummy", translate("Service Status"))
+status.template = "vpn-policy-routing/status"
+status.value = pkgStatusLabel
+if pkgStatus:match("Running") and pkgGateways and pkgGateways ~= "" then
+       gateways = h:option(DummyValue, "_dummy", translate("Service Gateways"))
+       gateways.template = packageName .. "/status-textarea"
+       gateways.value = pkgGateways
+end
+if pkgErrors and pkgErrors ~= "" then
+       errors = h:option(DummyValue, "_dummy", translate("Service Errors"))
+       errors.template = packageName .. "/status-textarea"
+       errors.value = pkgErrors
+end
+if pkgWarnings and pkgWarnings ~= "" then
+       warnings = h:option(DummyValue, "_dummy", translate("Service Warnings"))
+       warnings.template = packageName .. "/status-textarea"
+       warnings.value = pkgWarnings
+end
+buttons = h:option(DummyValue, "_dummy")
+buttons.template = packageName .. "/buttons"
+
+-- General Options
+config = m:section(NamedSection, "config", "vpn-policy-routing", translate("Configuration"))
+config.override_values = true
+config.override_depends = true
+
+-- Basic Options
+config:tab("basic", translate("Basic Configuration"))
+
+verb = config:taboption("basic", ListValue, "verbosity", translate("Output verbosity"),translate("Controls both system log and console output verbosity."))
+verb:value("0", translate("Suppress/No output"))
+verb:value("1", translate("Condensed output"))
+verb:value("2", translate("Verbose output"))
+verb.default = 2
+
+se = config:taboption("basic", ListValue, "strict_enforcement", translate("Strict enforcement"),translate("See the") .. " "
+       .. [[<a href="]] .. readmeURL .. [[#strict-enforcement" target="_blank">]]
+       .. translate("README") .. [[</a>]] .. " " .. translate("for details."))
+se:value("0", translate("Do not enforce policies when their gateway is down"))
+se:value("1", translate("Strictly enforce policies when their gateway is down"))
+se.default = 1
+
+dest_ipset = config:taboption("basic", ListValue, "dest_ipset", translate("The ipset option for remote policies"),
+       translate("Please check the") .. " "
+       .. [[<a href="]] .. readmeURL .. [[#additional-settings" target="_blank">]]
+       .. translate("README") .. [[</a>]] .. " " .. translate("before changing this option."))
+dest_ipset:value("", translate("Disabled"))
+dest_ipset:value("ipset", translate("Use ipset command"))
+dest_ipset:value("dnsmasq.ipset", translate("Use DNSMASQ ipset"))
+dest_ipset.default = ""
+dest_ipset.rmempty = true
+
+src_ipset = config:taboption("basic", ListValue, "src_ipset", translate("The ipset option for local policies"),
+       translate("Please check the") .. " "
+       .. [[<a href="]] .. readmeURL .. [[#additional-settings" target="_blank">]]
+       .. translate("README") .. [[</a>]] .. " " .. translate("before changing this option."))
+src_ipset:value("0", translate("Disabled"))
+src_ipset:value("1", translate("Use ipset command"))
+
+ipv6 = config:taboption("basic", ListValue, "ipv6_enabled", translate("IPv6 Support"))
+ipv6:value("0", translate("Disabled"))
+ipv6:value("1", translate("Enabled"))
+
+-- Advanced Options
+config:tab("advanced", translate("Advanced Configuration"),
+       "<br/>&nbsp;&nbsp;&nbsp;&nbsp;<b>" .. translate("WARNING:") .. "</b>" .. " " .. translate("Please make sure to check the") .. " "
+       .. [[<a href="]] .. readmeURL .. [[#additional-settings" target="_blank">]] .. translate("README") .. [[</a>]] .. " "
+       .. translate("before changing anything in this section! Change any of the settings below with extreme caution!") .. "<br/><br/>")
+
+supportedIface = config:taboption("advanced", DynamicList, "supported_interface", translate("Supported Interfaces"), translate("Allows to specify the list of interface names (in lower case) to be explicitly supported by the service. Can be useful if your OpenVPN tunnels have dev option other than tun* or tap*."))
+supportedIface.optional = false
+
+ignoredIface = config:taboption("advanced", DynamicList, "ignored_interface", translate("Ignored Interfaces"), translate("Allows to specify the list of interface names (in lower case) to be ignored by the service. Can be useful if running both VPN server and VPN client on the router."))
+ignoredIface.optional = false
+
+timeout = config:taboption("advanced", Value, "boot_timeout", translate("Boot Time-out"), translate("Time (in seconds) for service to wait for WAN gateway discovery on boot."))
+timeout.optional = false
+timeout.rmempty = true
+
+insert = config:taboption("advanced", ListValue, "iptables_rule_option", translate("IPTables rule option"), translate("Select Append for -A and Insert for -I."))
+insert:value("append", translate("Append"))
+insert:value("insert", translate("Insert"))
+insert.default = "append"
+
+iprule = config:taboption("advanced", ListValue, "iprule_enabled", translate("IP Rules Support"), translate("Add an ip rule, not an iptables entry for policies with just the local address. Use with caution to manipulte policies priorities."))
+iprule:value("0", translate("Disabled"))
+iprule:value("1", translate("Enabled"))
+
+icmp = config:taboption("advanced", ListValue, "icmp_interface", translate("Default ICMP Interface"), translate("Force the ICMP protocol interface."))
+icmp:value("", translate("No Change"))
+icmp:value("wan", translate("WAN"))
+uci:foreach("network", "interface", function(s)
+       local name=s['.name']
+       if is_supported_interface(s) then icmp:value(name, string.upper(name)) end
+end)
+icmp.rmempty = true
+
+append_local = config:taboption("advanced", Value, "append_src_rules", translate("Append local IP Tables rules"), translate("Special instructions to append iptables rules for local IPs/netmasks/devices."))
+append_local.rmempty = true
+
+append_remote = config:taboption("advanced", Value, "append_dest_rules", translate("Append remote IP Tables rules"), translate("Special instructions to append iptables rules for remote IPs/netmasks."))
+append_remote.rmempty = true
+
+wantid = config:taboption("advanced", Value, "wan_tid", translate("WAN Table ID"), translate("Starting (WAN) Table ID number for tables created by the service."))
+wantid.rmempty = true
+wantid.placeholder = "201"
+wantid.datatype    = 'and(uinteger, min(201))'
+
+wanmark = config:taboption("advanced", Value, "wan_mark", translate("WAN Table FW Mark"), translate("Starting (WAN) FW Mark for marks used by the service. High starting mark is used to avoid conflict with SQM/QoS. Change with caution together with") .. " " .. translate("Service FW Mask") .. ".")
+wanmark.rmempty = true
+wanmark.placeholder = "0x010000"
+wanmark.datatype    = "hex(8)"
+
+fwmask = config:taboption("advanced", Value, "fw_mask", translate("Service FW Mask"), translate("FW Mask used by the service. High mask is used to avoid conflict with SQM/QoS. Change with caution together with") .. " " .. translate("WAN Table FW Mark") .. ".")
+fwmask.rmempty = true
+fwmask.placeholder = "0xff0000"
+fwmask.datatype    = "hex(8)"
+
+config:tab("webui", translate("Web UI Configuration"))
+
+webui_enable_column = config:taboption("webui", ListValue, "webui_enable_column", translate("Show Enable Column"), translate("Shows the enable checkbox column for policies, allowing you to quickly enable/disable specific policy without deleting it."))
+webui_enable_column:value("0", translate("Disabled"))
+webui_enable_column:value("1", translate("Enabled"))
+
+webui_protocol_column = config:taboption("webui", ListValue, "webui_protocol_column", translate("Show Protocol Column"), translate("Shows the protocol column for policies, allowing you to assign a specific protocol to a policy."))
+webui_protocol_column:value("0", translate("Disabled"))
+webui_protocol_column:value("1", translate("Enabled"))
+
+webui_supported_protocol = config:taboption("webui", DynamicList, "webui_supported_protocol", translate("Supported Protocols"), translate("Display these protocols in protocol column in Web UI."))
+webui_supported_protocol.optional = false
+
+webui_chain_column = config:taboption("webui", ListValue, "webui_chain_column", translate("Show Chain Column"), translate("Shows the chain column for policies, allowing you to assign a PREROUTING, FORWARD, INPUT or OUTPUT chain to a policy."))
+webui_chain_column:value("0", translate("Disabled"))
+webui_chain_column:value("1", translate("Enabled"))
+
+webui_sorting = config:taboption("webui", ListValue, "webui_sorting", translate("Show Up/Down Buttons"), translate("Shows the Up/Down buttons for policies, allowing you to move a policy up or down in the list."))
+webui_sorting:value("0", translate("Disabled"))
+webui_sorting:value("1", translate("Enabled"))
+webui_sorting.default = "1"
+
+
+-- Policies
+p = m:section(TypedSection, "policy", translate("Policies"), translate("Comment, interface and at least one other field are required. Multiple local and remote addresses/devices/domains and ports can be space separated. Placeholders below represent just the format/syntax and will not be used if fields are left blank."))
+p.template = "cbi/tblsection"
+enc = tonumber(uci:get("vpn-policy-routing", "config", "webui_sorting"))
+if not enc or enc ~= 0 then
+       p.sortable  = true
+end
+p.anonymous = true
+p.addremove = true
+
+enc = tonumber(uci:get("vpn-policy-routing", "config", "webui_enable_column"))
+if enc and enc ~= 0 then
+       le = p:option(Flag, "enabled", translate("Enabled"))
+       le.default = "1"
+end
+
+local comment = uci:get_first("vpn-policy-routing", "policy", "comment")
+if comment then
+       p:option(Value, "comment", translate("Comment"))
+else
+       p:option(Value, "name", translate("Name"))
+end
+
+la = p:option(Value, "src_addr", translate("Local addresses / devices"))
+if laPlaceholder then
+       la.placeholder = laPlaceholder
+end
+la.rmempty = true
+la.datatype    = 'list(neg(or(host,network,macaddr)))'
+
+lp = p:option(Value, "src_port", translate("Local ports"))
+lp.datatype    = 'list(neg(or(portrange, string)))'
+lp.placeholder = "0-65535"
+lp.rmempty = true
+
+ra = p:option(Value, "dest_addr", translate("Remote addresses / domains"))
+ra.datatype    = 'list(neg(host))'
+ra.placeholder = "0.0.0.0/0"
+ra.rmempty = true
+
+rp = p:option(Value, "dest_port", translate("Remote ports"))
+rp.datatype    = 'list(neg(or(portrange, string)))'
+rp.placeholder = "0-65535"
+rp.rmempty = true
+
+enc = tonumber(uci:get("vpn-policy-routing", "config", "webui_protocol_column"))
+if enc and enc ~= 0 then
+       proto = p:option(ListValue, "proto", translate("Protocol"))
+       proto:value("", "AUTO")
+       proto.default = ""
+       proto.rmempty = true
+       enc = uci:get_list("vpn-policy-routing", "config", "webui_supported_protocol")
+       local count = 0
+       for key, value in pairs(enc) do
+               count = count + 1
+               proto:value(value:lower(), value:gsub(" ", "/"):upper())
+       end
+       if count == 0 then
+               enc = { "tcp", "udp", "tcp udp", "icmp", "all" }
+               for key,value in pairs(enc) do
+                       proto:value(value:lower(), value:gsub(" ", "/"):upper())
+               end
+       end
+end
+
+enc = tonumber(uci:get("vpn-policy-routing", "config", "webui_chain_column"))
+if enc and enc ~= 0 then
+       chain = p:option(ListValue, "chain", translate("Chain"))
+       chain:value("", "PREROUTING")
+       chain:value("FORWARD", "FORWARD")
+       chain:value("INPUT", "INPUT")
+       chain:value("OUTPUT", "OUTPUT")
+       chain.default = ""
+       chain.rmempty = true
+end
+
+gw = p:option(ListValue, "interface", translate("Interface"))
+gw.datatype = "network"
+gw.rmempty = false
+uci:foreach("network", "interface", function(s)
+       local name=s['.name']
+       if is_wan(name) then
+               gw:value(name, string.upper(name))
+               if not gw.default then gw.default = name end
+       elseif is_supported_interface(s) then 
+               gw:value(name, string.upper(name)) 
+       end
+end)
+
+dscp = m:section(NamedSection, "config", "vpn-policy-routing", translate("DSCP Tagging"), translate("Set DSCP tags (in range between 1 and 63) for specific interfaces. See the") .. " "
+       .. [[<a href="]] .. readmeURL .. [[#dscp-tag-based-policies" target="_blank">]]
+       .. translate("README") .. [[</a>]] .. " " .. translate("for details."))
+uci:foreach("network", "interface", function(s)
+       local name=s['.name']
+       if is_supported_interface(s) then 
+               local x = dscp:option(Value, name .. "_dscp", string.upper(name) .. " " .. translate("DSCP Tag"))
+               x.rmempty = true
+               x.datatype = "range(1,63)"
+       end
+end)
+
+-- Includes
+inc = m:section(TypedSection, "include", translate("Custom User File Includes"), translate("Run the following user files after setting up but before restarting DNSMASQ. See the") .. " "
+       .. [[<a href="]] .. readmeURL .. [[#custom-user-files" target="_blank">]]
+       .. translate("README") .. [[</a>]] .. " " .. translate("for details."))
+inc.template = "cbi/tblsection"
+inc.sortable  = true
+inc.anonymous = true
+inc.addremove = true
+
+finc = inc:option(Flag, "enabled", translate("Enabled"))
+finc.optional = false
+finc.default = "1"
+inc:option(Value, "path", translate("Path")).optional = false
+
+return m

diff --git a/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm
new file mode 100644 (file)
index 0000000..a9c473c
--- /dev/null
+++ b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm
@@ -0,0 +1,55 @@
+<%#
+       Copyright 2019 Stan Grishin <stangri@melmac.net>
+-%>
+
+<%-
+       local packageName = "vpn-policy-routing"
+       local enabledFlag = luci.model.uci.cursor():get(packageName, "config", "enabled")
+       if nixio.fs.access("/var/run/" .. packageName .. ".json") then
+               tmpfs = luci.jsonc.parse(luci.util.trim(luci.sys.exec("cat /var/run/" .. packageName .. ".json")))
+       end
+       local pkgStatus, pkgStatusLabel = "Stopped", translate("Stopped")
+       if luci.sys.call("iptables -t mangle -L | grep -q VPR_PREROUTING") == 0 then
+               pkgStatus, pkgStatusLabel = "Running", translate("Running")
+       end
+       if pkgStatus == "Stopped" then
+               btn_start_style = "cbi-button cbi-button-apply important"
+               btn_action_style = "cbi-button cbi-button-apply important"
+               btn_stop_style = "cbi-button cbi-button-reset -disabled"
+       else
+               btn_start_style = "cbi-button cbi-button-apply -disabled"
+               btn_action_style = "cbi-button cbi-button-apply important"
+               btn_stop_style = "cbi-button cbi-button-reset important"
+       end
+       if enabledFlag ~= "1" then
+               btn_start_style = "cbi-button cbi-button-apply -disabled"
+               btn_action_style = "cbi-button cbi-button-apply -disabled"
+               btn_enable_style = "cbi-button cbi-button-apply important"
+               btn_disable_style = "cbi-button cbi-button-reset -disabled"
+       else
+               btn_enable_style = "cbi-button cbi-button-apply -disabled"
+               btn_disable_style = "cbi-button cbi-button-reset important"
+       end
+-%>
+
+<%+vpn-policy-routing/css%>
+<%+vpn-policy-routing/js%>
+
+<div class="cbi-value"><label class="cbi-value-title">Service Control</label>
+       <div class="cbi-value-field">
+               <input type="button" class="<%=btn_start_style%>" id="btn_start" name="start" value="<%:Start%>" onclick="button_action(this)" />
+               <span id="btn_start_spinner" class="btn_spinner"></span>
+               <input type="button" class="<%=btn_action_style%>" id="btn_action" name="action" value="<%:Reload%>" onclick="button_action(this)" />
+               <span id="btn_action_spinner" class="btn_spinner"></span>
+               <input type="button" class="<%=btn_stop_style%>" id="btn_stop" name="stop" value="<%:Stop%>" onclick="button_action(this)"  />
+               <span id="btn_stop_spinner" class="btn_spinner"></span>
+               &nbsp;
+               &nbsp;
+               &nbsp;
+               &nbsp;
+               <input type="button" class="<%=btn_enable_style%>" id="btn_enable" name="enable" value="<%:Enable%>" onclick="button_action(this)"  />
+               <span id="btn_enable_spinner" class="btn_spinner"></span>
+               <input type="button" class="<%=btn_disable_style%>" id="btn_disable" name="disable" value="<%:Disable%>" onclick="button_action(this)"  />
+               <span id="btn_disable_spinner" class="btn_spinner"></span>
+       </div>
+</div>

diff --git a/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/css.htm b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/css.htm
new file mode 100644 (file)
index 0000000..6fb3d51
--- /dev/null
+++ b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/css.htm
@@ -0,0 +1,9 @@
+<style type="text/css">
+       .btn_spinner
+       {
+               display: inline-block;
+               width: 0px;
+               height: 16px;
+               margin: 0 0px;
+       }
+</style>

diff --git a/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/js.htm b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/js.htm
new file mode 100644 (file)
index 0000000..7c19032
--- /dev/null
+++ b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/js.htm
@@ -0,0 +1,59 @@
+<script type="text/javascript">
+//<![CDATA[
+ function button_action(action) {
+       var xhr = new XHR(false);
+       var btn_start = document.getElementById("btn_start");
+       var btn_action = document.getElementById("btn_action");
+       var btn_stop = document.getElementById("btn_stop");
+       var btn_enable = document.getElementById("btn_enable");
+       var btn_disable = document.getElementById("btn_disable");
+       var btn_spinner;
+       switch (action.name) {
+               case "start":
+                       btn_spinner = document.getElementById("btn_start_spinner");
+                       break;
+               case "action":
+                       btn_spinner = document.getElementById("btn_action_spinner");
+                       break;
+               case "stop":
+                       btn_spinner = document.getElementById("btn_stop_spinner");
+                       break;
+               case "enable":
+                       btn_spinner = document.getElementById("btn_enable_spinner");
+                       break;
+               case "disable":
+                       btn_spinner = document.getElementById("btn_disable_spinner");
+                       break;
+       }
+       btn_start.disabled = true;
+       btn_action.disabled = true;
+       btn_stop.disabled = true;
+       btn_enable.disabled = true;
+       btn_disable.disabled = true;
+       spinner(btn_spinner, 1);
+       xhr.get('<%=luci.dispatcher.build_url("admin", "vpn", "vpn-policy-routing", "action")%>/' + action.name, null,
+               function (x) {
+                       if (!x) {
+                               return;
+                       }
+                       btn_start.disabled = false;
+                       btn_action.disabled = false;
+                       btn_stop.disabled = false;
+                       btn_enable.disabled = false;
+                       btn_disable.disabled = false;
+                       spinner(btn_spinner, 0);
+                       location.reload();
+                });
+}
+function spinner(element, state) {
+       if (state === 1) {
+               element.style.width = "16px";
+               element.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" width="16" height="16" style="vertical-align:middle" />';
+       }
+       else {
+               element.style.width = "0px";
+               element.innerHTML = '';
+       }
+}
+//]]>
+</script>
\ No newline at end of file

diff --git a/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-textarea.htm b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-textarea.htm
new file mode 100644 (file)
index 0000000..f4c512c
--- /dev/null
+++ b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-textarea.htm
@@ -0,0 +1,13 @@
+<%#
+Copyright 2017-2019 Stan Grishin (stangri@melmac.net)
+This is free software, licensed under the Apache License, Version 2.0
+-%>
+
+<%+cbi/valueheader%>
+
+<textarea rows="<%=select(2, self:cfgvalue(section):gsub('\n', '\n'))%>"
+       style="outline:none;border:none;box-shadow:none;background:transparent;font-weight:bold;line-height:20px;width:50em;padding:none;margin:6px;resize:none;overflow:hidden;"
+       disabled="disabled"><%=self:cfgvalue(section):gsub('\n', '\n')%>
+</textarea>
+
+<%+cbi/valuefooter%>

diff --git a/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status.htm b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status.htm
new file mode 100644 (file)
index 0000000..c453428
--- /dev/null
+++ b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status.htm
@@ -0,0 +1,10 @@
+<%#
+Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
+This is free software, licensed under the Apache License, Version 2.0
+-%>
+
+<%+cbi/valueheader%>
+
+<input name="status" id="status" type="text" class="cbi-input-text" style="outline:none;border:none;box-shadow:none;background:transparent;font-weight:bold;line-height:30px;height:30px;width:50em;" value="<%=self:cfgvalue(section)%>" disabled="disabled" />
+
+<%+cbi/valuefooter%>

diff --git a/applications/luci-app-vpn-policy-routing/po/es/vpn-policy-routing.po b/applications/luci-app-vpn-policy-routing/po/es/vpn-policy-routing.po
new file mode 100644 (file)
index 0000000..feeea78
--- /dev/null
+++ b/applications/luci-app-vpn-policy-routing/po/es/vpn-policy-routing.po
@@ -0,0 +1,504 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2019-12-31 15:30-0300\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.2.4\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: es\n"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:51
+msgid "(strict mode)"
+msgstr "(modo estricto)"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:207
+msgid ""
+"Add an ip rule, not an iptables entry for policies with just the local "
+"address. Use with caution to manipulte policies priorities."
+msgstr ""
+"Agregue una regla de ip, no una entrada de iptables para políticas con solo "
+"la dirección local. Úselo con precaución para manipular las prioridades de "
+"las políticas."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:187
+msgid "Advanced Configuration"
+msgstr "Configuración avanzada"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:192
+msgid ""
+"Allows to specify the list of interface names (in lower case) to be "
+"explicitly supported by the service. Can be useful if your OpenVPN tunnels "
+"have dev option other than tun* or tap*."
+msgstr ""
+"Permite especificar la lista de nombres de interfaz (en minúsculas) que el "
+"servicio debe admitir explícitamente. Puede ser útil si sus túneles OpenVPN "
+"tienen una opción de desarrollo que no sea tun* o tap*."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:195
+msgid ""
+"Allows to specify the list of interface names (in lower case) to be ignored "
+"by the service. Can be useful if running both VPN server and VPN client on "
+"the router."
+msgstr ""
+"Permite especificar la lista de nombres de interfaz (en minúsculas) que el "
+"servicio debe ignorar. Puede ser útil si ejecuta tanto el servidor VPN como "
+"el cliente VPN en el enrutador."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:203
+msgid "Append"
+msgstr "Adjuntar"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:220
+msgid "Append local IP Tables rules"
+msgstr "Adjuntar reglas locales de IPTables"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:223
+msgid "Append remote IP Tables rules"
+msgstr "Adjuntar reglas remotas de IPTables"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:150
+msgid "Basic Configuration"
+msgstr "Configuración básica"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:198
+msgid "Boot Time-out"
+msgstr "Tiempo de arranque"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:331
+msgid "Chain"
+msgstr "Cadena"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:282
+msgid "Comment"
+msgstr "Comentario"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:265
+msgid ""
+"Comment, interface and at least one other field are required. Multiple local "
+"and remote addresses/devices/domains and ports can be space separated. "
+"Placeholders below represent just the format/syntax and will not be used if "
+"fields are left blank."
+msgstr ""
+"Se requieren comentarios, interfaz y al menos otro campo. Múltiples "
+"direcciones/dispositivos/dominios y puertos locales y remotos pueden estar "
+"separados por espacios. Los marcadores de posición a continuación "
+"representan solo el formato/sintaxis y no se utilizarán si los campos se "
+"dejan en blanco."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:154
+msgid "Condensed output"
+msgstr "Salida condensada"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:145
+msgid "Configuration"
+msgstr "Configuración"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:152
+msgid "Controls both system log and console output verbosity."
+msgstr ""
+"Controla el registro del sistema y la verbosidad de salida de la consola."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:366
+msgid "Custom User File Includes"
+msgstr "El archivo de usuario personalizado incluye"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:359
+msgid "DSCP Tag"
+msgstr "Etiqueta DSCP"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:353
+msgid "DSCP Tagging"
+msgstr "Etiquetado DSCP"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:211
+msgid "Default ICMP Interface"
+msgstr "Interfaz ICMP predeterminada"
+
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:52
+msgid "Disable"
+msgstr "Desactivar"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:169
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:179
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:183
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:208
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:244
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:248
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:255
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:259
+msgid "Disabled"
+msgstr "Desactivado"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:251
+msgid "Display these protocols in protocol column in Web UI."
+msgstr "Mostrar estos protocolos en la columna de protocolo en la Web UI."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:161
+msgid "Do not enforce policies when their gateway is down"
+msgstr "No aplique políticas cuando su puerta de enlace esté inactiva"
+
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:50
+msgid "Enable"
+msgstr "Activar"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:184
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:209
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:245
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:249
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:256
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:260
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:276
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:374
+msgid "Enabled"
+msgstr "Activado"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:236
+msgid ""
+"FW Mask used by the service. High mask is used to avoid conflict with SQM/"
+"QoS. Change with caution together with"
+msgstr ""
+"FW Mask utilizada por el servicio. La máscara alta se usa para evitar "
+"conflictos con SQM/QoS. Cambiar con precaución junto con"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:211
+msgid "Force the ICMP protocol interface."
+msgstr "Forzar la interfaz del protocolo ICMP."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:207
+msgid "IP Rules Support"
+msgstr "Soporte de reglas de IP"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:202
+msgid "IPTables rule option"
+msgstr "Opción de regla de IPTables"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:182
+msgid "IPv6 Support"
+msgstr "Soporte IPv6"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:195
+msgid "Ignored Interfaces"
+msgstr "Interfaces ignoradas"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:204
+msgid "Insert"
+msgstr "Insertar"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:340
+msgid "Interface"
+msgstr "Interfaz"
+
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/js.htm:51
+msgid "Loading"
+msgstr "Cargando"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:287
+msgid "Local addresses / devices"
+msgstr "Direcciones/Dispositivos locales"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:294
+msgid "Local ports"
+msgstr "Puertos locales"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:284
+msgid "Name"
+msgstr "Nombre"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:212
+msgid "No Change"
+msgstr "Ningún cambio"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:152
+msgid "Output verbosity"
+msgstr "Verbosidad de salida"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:377
+msgid "Path"
+msgstr "Ruta"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:166
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:176
+msgid "Please check the"
+msgstr "Por favor, verifique el"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:188
+msgid "Please make sure to check the"
+msgstr "Por favor, asegúrese de verificar el"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:265
+msgid "Policies"
+msgstr "Políticas"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:311
+msgid "Protocol"
+msgstr "Protocolo"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:160
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:168
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:178
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:189
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:355
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:368
+msgid "README"
+msgstr "LÉEME"
+
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:42
+msgid "Reload"
+msgstr "Recargar"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:299
+msgid "Remote addresses / domains"
+msgstr "Direcciones/Dominios remotos"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:304
+msgid "Remote ports"
+msgstr "Puertos remotos"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:366
+msgid ""
+"Run the following user files after setting up but before restarting DNSMASQ. "
+"See the"
+msgstr ""
+"Ejecute los siguientes archivos de usuario después de la configuración pero "
+"antes de reiniciar DNSMASQ. Ver el"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:49
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:13
+msgid "Running"
+msgstr "Corriendo"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:158
+msgid "See the"
+msgstr "Ver el"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:202
+msgid "Select Append for -A and Insert for -I."
+msgstr "Seleccione Agregar para -A e Insertar para -I."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:132
+msgid "Service Errors"
+msgstr "Errores del servicio"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:231
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:236
+msgid "Service FW Mask"
+msgstr "Servicio FW Mask"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:127
+msgid "Service Gateways"
+msgstr "Puertas de enlace del servicio"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:122
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:123
+msgid "Service Status"
+msgstr "Estado del servicio"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:137
+msgid "Service Warnings"
+msgstr "Advertencias del servicio"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:353
+msgid ""
+"Set DSCP tags (in range between 1 and 63) for specific interfaces. See the"
+msgstr ""
+"Establezca etiquetas DSCP (en el rango entre 1 y 63) para interfaces "
+"específicas. Ver el"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:254
+msgid "Show Chain Column"
+msgstr "Mostrar columna de cadena"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:243
+msgid "Show Enable Column"
+msgstr "Mostrar columna de Activar"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:247
+msgid "Show Protocol Column"
+msgstr "Mostrar columna de protocolo"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:258
+msgid "Show Up/Down Buttons"
+msgstr "Mostrar botones Subir/Bajar"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:258
+msgid ""
+"Shows the Up/Down buttons for policies, allowing you to move a policy up or "
+"down in the list."
+msgstr ""
+"Muestra los botones Subir/Bajar para políticas, lo que le permite mover una "
+"política hacia arriba o hacia abajo en la lista."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:254
+msgid ""
+"Shows the chain column for policies, allowing you to assign a PREROUTING, "
+"FORWARD, INPUT or OUTPUT chain to a policy."
+msgstr ""
+"Muestra la columna de cadena para políticas, permitiéndole asignar una "
+"cadena PREROUTING, FORWARD, INPUT o OUTPUT a una política."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:243
+msgid ""
+"Shows the enable checkbox column for policies, allowing you to quickly "
+"enable/disable specific policy without deleting it."
+msgstr ""
+"Muestra la columna de casilla de verificación Activar para políticas, lo que "
+"le permite Activar/Desactivar rápidamente políticas específicas sin "
+"eliminarlas."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:247
+msgid ""
+"Shows the protocol column for policies, allowing you to assign a specific "
+"protocol to a policy."
+msgstr ""
+"Muestra la columna de protocolo para políticas, lo que le permite asignar un "
+"protocolo específico a una política."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:220
+msgid ""
+"Special instructions to append iptables rules for local IPs/netmasks/devices."
+msgstr ""
+"Instrucciones especiales para agregar reglas de iptables para IPs/máscaras "
+"de red/dispositivos locales."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:223
+msgid "Special instructions to append iptables rules for remote IPs/netmasks."
+msgstr ""
+"Instrucciones especiales para agregar reglas de iptables para IP remotas/"
+"máscaras de red."
+
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:40
+msgid "Start"
+msgstr "Iniciar"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:231
+msgid ""
+"Starting (WAN) FW Mark for marks used by the service. High starting mark is "
+"used to avoid conflict with SQM/QoS. Change with caution together with"
+msgstr ""
+"Marca de inicio (WAN) FW para las marcas utilizadas por el servicio. La "
+"marca de inicio alta se usa para evitar conflictos con SQM/QoS. Cambiar con "
+"precaución junto con"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:226
+msgid "Starting (WAN) Table ID number for tables created by the service."
+msgstr ""
+"Número de ID de tabla de inicio (WAN) para tablas creadas por el servicio."
+
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:44
+msgid "Stop"
+msgstr "Detener"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:47
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:11
+msgid "Stopped"
+msgstr "Detenido"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:158
+msgid "Strict enforcement"
+msgstr "Aplicación estricta"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:162
+msgid "Strictly enforce policies when their gateway is down"
+msgstr ""
+"Cumplir estrictamente las políticas cuando su puerta de enlace esté inactiva"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:192
+msgid "Supported Interfaces"
+msgstr "Interfaces soportadas"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:251
+msgid "Supported Protocols"
+msgstr "Protocolos soportados"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:153
+msgid "Suppress/No output"
+msgstr "Suprimir/Sin salida"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:175
+msgid "The ipset option for local policies"
+msgstr "La opción ipset para políticas locales"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:165
+msgid "The ipset option for remote policies"
+msgstr "La opción ipset para políticas remotas"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:198
+msgid ""
+"Time (in seconds) for service to wait for WAN gateway discovery on boot."
+msgstr ""
+"Tiempo (en segundos) para que el servicio espere el descubrimiento de la "
+"puerta de enlace WAN en el arranque."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:171
+msgid "Use DNSMASQ ipset"
+msgstr "Usar DNSMASQ ipset"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:170
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:180
+msgid "Use ipset command"
+msgstr "Usar el comando ipset"
+
+#: luci-app-vpn-policy-routing/luasrc/controller/vpn-policy-routing.lua:4
+msgid "VPN"
+msgstr "VPN"
+
+#: luci-app-vpn-policy-routing/luasrc/controller/vpn-policy-routing.lua:5
+msgid "VPN Policy Routing"
+msgstr "Enrutamiento de políticas de VPN"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:120
+msgid "VPN and WAN Policy-Based Routing"
+msgstr "Enrutamiento basado en políticas VPN y WAN"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:155
+msgid "Verbose output"
+msgstr "Salida detallada"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:213
+msgid "WAN"
+msgstr "WAN"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:231
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:236
+msgid "WAN Table FW Mark"
+msgstr "Tabla WAN Marca FW"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:226
+msgid "WAN Table ID"
+msgstr "ID de tabla WAN"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:188
+msgid "WARNING:"
+msgstr "ADVERTENCIA:"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:241
+msgid "Web UI Configuration"
+msgstr "Configuración de Web UI"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:190
+msgid ""
+"before changing anything in this section! Change any of the settings below "
+"with extreme caution!"
+msgstr ""
+"antes de cambiar cualquier cosa en esta sección, ¡Cambie cualquiera de las "
+"configuraciones a continuación con extrema precaución!"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:168
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:178
+msgid "before changing this option."
+msgstr "antes de cambiar esta opción."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:160
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:355
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:368
+msgid "for details."
+msgstr "para detalles."
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:43
+msgid "is not installed or not found"
+msgstr "no está instalado o no se encuentra"

diff --git a/applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot b/applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot
new file mode 100644 (file)
index 0000000..74a2c8f
--- /dev/null
+++ b/applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot
@@ -0,0 +1,450 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:51
+msgid "(strict mode)"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:207
+msgid ""
+"Add an ip rule, not an iptables entry for policies with just the local "
+"address. Use with caution to manipulte policies priorities."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:187
+msgid "Advanced Configuration"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:192
+msgid ""
+"Allows to specify the list of interface names (in lower case) to be "
+"explicitly supported by the service. Can be useful if your OpenVPN tunnels "
+"have dev option other than tun* or tap*."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:195
+msgid ""
+"Allows to specify the list of interface names (in lower case) to be ignored "
+"by the service. Can be useful if running both VPN server and VPN client on "
+"the router."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:203
+msgid "Append"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:220
+msgid "Append local IP Tables rules"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:223
+msgid "Append remote IP Tables rules"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:150
+msgid "Basic Configuration"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:198
+msgid "Boot Time-out"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:331
+msgid "Chain"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:282
+msgid "Comment"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:265
+msgid ""
+"Comment, interface and at least one other field are required. Multiple local "
+"and remote addresses/devices/domains and ports can be space separated. "
+"Placeholders below represent just the format/syntax and will not be used if "
+"fields are left blank."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:154
+msgid "Condensed output"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:145
+msgid "Configuration"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:152
+msgid "Controls both system log and console output verbosity."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:366
+msgid "Custom User File Includes"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:359
+msgid "DSCP Tag"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:353
+msgid "DSCP Tagging"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:211
+msgid "Default ICMP Interface"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:52
+msgid "Disable"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:169
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:179
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:183
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:208
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:244
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:248
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:255
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:259
+msgid "Disabled"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:251
+msgid "Display these protocols in protocol column in Web UI."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:161
+msgid "Do not enforce policies when their gateway is down"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:50
+msgid "Enable"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:184
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:209
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:245
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:249
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:256
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:260
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:276
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:374
+msgid "Enabled"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:236
+msgid ""
+"FW Mask used by the service. High mask is used to avoid conflict with SQM/"
+"QoS. Change with caution together with"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:211
+msgid "Force the ICMP protocol interface."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:207
+msgid "IP Rules Support"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:202
+msgid "IPTables rule option"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:182
+msgid "IPv6 Support"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:195
+msgid "Ignored Interfaces"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:204
+msgid "Insert"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:340
+msgid "Interface"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/js.htm:51
+msgid "Loading"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:287
+msgid "Local addresses / devices"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:294
+msgid "Local ports"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:284
+msgid "Name"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:212
+msgid "No Change"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:152
+msgid "Output verbosity"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:377
+msgid "Path"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:166
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:176
+msgid "Please check the"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:188
+msgid "Please make sure to check the"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:265
+msgid "Policies"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:311
+msgid "Protocol"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:160
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:168
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:178
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:189
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:355
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:368
+msgid "README"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:42
+msgid "Reload"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:299
+msgid "Remote addresses / domains"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:304
+msgid "Remote ports"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:366
+msgid ""
+"Run the following user files after setting up but before restarting DNSMASQ. "
+"See the"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:49
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:13
+msgid "Running"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:158
+msgid "See the"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:202
+msgid "Select Append for -A and Insert for -I."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:132
+msgid "Service Errors"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:231
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:236
+msgid "Service FW Mask"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:127
+msgid "Service Gateways"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:122
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:123
+msgid "Service Status"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:137
+msgid "Service Warnings"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:353
+msgid ""
+"Set DSCP tags (in range between 1 and 63) for specific interfaces. See the"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:254
+msgid "Show Chain Column"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:243
+msgid "Show Enable Column"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:247
+msgid "Show Protocol Column"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:258
+msgid "Show Up/Down Buttons"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:258
+msgid ""
+"Shows the Up/Down buttons for policies, allowing you to move a policy up or "
+"down in the list."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:254
+msgid ""
+"Shows the chain column for policies, allowing you to assign a PREROUTING, "
+"FORWARD, INPUT or OUTPUT chain to a policy."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:243
+msgid ""
+"Shows the enable checkbox column for policies, allowing you to quickly "
+"enable/disable specific policy without deleting it."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:247
+msgid ""
+"Shows the protocol column for policies, allowing you to assign a specific "
+"protocol to a policy."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:220
+msgid ""
+"Special instructions to append iptables rules for local IPs/netmasks/devices."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:223
+msgid "Special instructions to append iptables rules for remote IPs/netmasks."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:40
+msgid "Start"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:231
+msgid ""
+"Starting (WAN) FW Mark for marks used by the service. High starting mark is "
+"used to avoid conflict with SQM/QoS. Change with caution together with"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:226
+msgid "Starting (WAN) Table ID number for tables created by the service."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:44
+msgid "Stop"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:47
+#: luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:11
+msgid "Stopped"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:158
+msgid "Strict enforcement"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:162
+msgid "Strictly enforce policies when their gateway is down"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:192
+msgid "Supported Interfaces"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:251
+msgid "Supported Protocols"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:153
+msgid "Suppress/No output"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:175
+msgid "The ipset option for local policies"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:165
+msgid "The ipset option for remote policies"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:198
+msgid ""
+"Time (in seconds) for service to wait for WAN gateway discovery on boot."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:171
+msgid "Use DNSMASQ ipset"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:170
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:180
+msgid "Use ipset command"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/controller/vpn-policy-routing.lua:4
+msgid "VPN"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/controller/vpn-policy-routing.lua:5
+msgid "VPN Policy Routing"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:120
+msgid "VPN and WAN Policy-Based Routing"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:155
+msgid "Verbose output"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:213
+msgid "WAN"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:231
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:236
+msgid "WAN Table FW Mark"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:226
+msgid "WAN Table ID"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:188
+msgid "WARNING:"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:241
+msgid "Web UI Configuration"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:190
+msgid ""
+"before changing anything in this section! Change any of the settings below "
+"with extreme caution!"
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:168
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:178
+msgid "before changing this option."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:160
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:355
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:368
+msgid "for details."
+msgstr ""
+
+#: luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:43
+msgid "is not installed or not found"
+msgstr ""

diff --git a/applications/luci-app-vpn-policy-routing/root/etc/uci-defaults/40_luci-vpn-policy-routing b/applications/luci-app-vpn-policy-routing/root/etc/uci-defaults/40_luci-vpn-policy-routing
new file mode 100644 (file)
index 0000000..a1ecfce
--- /dev/null
+++ b/applications/luci-app-vpn-policy-routing/root/etc/uci-defaults/40_luci-vpn-policy-routing
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
+exit 0

diff --git a/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass b/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass
index 9455701a096adeae119cff276cbd7c7bacba5a5f..d7bfee271dbacbc13f28feba1f7ffba2a36be6fe 100644 (file)
--- a/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass
+++ b/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass
@@ -1,11 +1,4 @@
 #!/bin/sh
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@vpnbypass[-1]
-       add ucitrack vpnbypass
-       set ucitrack.@vpnbypass[-1].init=vpnbypass
-       commit ucitrack
-EOF
 
 rm -f /tmp/luci-indexcache
 exit 0
-

diff --git a/build/i18n-scan.pl b/build/i18n-scan.pl
index c19a4386ce5652e09a9baec206bcc0bbb44d71cd..5ac1cb77d4986854051cb39b5adb51e83da4afcc 100755 (executable)
--- a/build/i18n-scan.pl
+++ b/build/i18n-scan.pl
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 
+use utf8;
 use strict;
 use warnings;
 use Text::Balanced qw(extract_tagged gen_delimited_pat);
@@ -15,12 +16,49 @@ my %stringtable;
 sub dec_lua_str
 {
        my $s = shift;
-       $s =~ s/\\n/\n/g;
-       $s =~ s/\\t/\t/g;
-       $s =~ s/\\(.)/$1/sg;
+       my %rep = (
+               'a' => "\x07",
+               'b' => "\x08",
+               'f' => "\x0c",
+               'n' => "\n",
+               'r' => "\r",
+               't' => "\t",
+               'v' => "\x76"
+       );
+
+       $s =~ s!\\(?:([0-9]{1,2})|(.))!
+               $1 ? chr(int($1)) : ($rep{$2} || $2)
+       !segx;
+
+       $s =~ s/[\s\n]+/ /g;
+       $s =~ s/^ //;
+       $s =~ s/ $//;
+
+       return $s;
+}
+
+sub dec_json_str
+{
+       my $s = shift;
+       my %rep = (
+               '"' => '"',
+               '/' => '/',
+               'b' => "\x08",
+               'f' => "\x0c",
+               'n' => "\n",
+               'r' => "\r",
+               't' => "\t",
+               '\\' => '\\'
+       );
+
+       $s =~ s!\\([\\/"bfnrt]|u([0-9a-fA-F]{4}))!
+               $2 ? chr(hex($2)) : $rep{$1}
+       !egx;
+
        $s =~ s/[\s\n]+/ /g;
        $s =~ s/^ //;
        $s =~ s/ $//;
+
        return $s;
 }
 
@@ -43,6 +81,8 @@ if( open F, "find @ARGV -type f '(' -name '*.htm' -o -name '*.lua' -o -name '*.j
 
                if( open S, "< $file" )
                {
+                       binmode S, ':utf8';
+
                        local $/ = undef;
                        my $raw = <S>;
                        close S;
@@ -148,9 +188,84 @@ if( open F, "find @ARGV -type f '(' -name '*.htm' -o -name '*.lua' -o -name '*.j
        close F;
 }
 
+if( open F, "find @ARGV -type f -path '*/menu.d/*.json' | sort |" )
+{
+       while( defined( my $file = readline F ) )
+       {
+               chomp $file;
+
+               if( open S, "< $file" )
+               {
+                       binmode S, ':utf8';
+
+                       local $/ = undef;
+                       my $raw = <S>;
+                       close S;
+
+                       my $text = $raw;
+                       my $line = 1;
+
+                       while ($text =~ s/ ^ (.*?) "title" ([\n\s]*) : //sgx)
+                       {
+                               my ($prefix, $suffix) = ($1, $2);
+                               my $code;
+                               my $res = "";
+                               my $sub = "";
+
+                               $line += () = $prefix =~ /\n/g;
+
+                               my $position = "$file:$line";
+
+                               $line += () = $suffix =~ /\n/g;
+
+                               while (defined $sub)
+                               {
+                                       undef $sub;
+
+                                       if ($text =~ /^ ([\n\s]*) " /sx)
+                                       {
+                                               my $ws = $1;
+                                               my $re = gen_delimited_pat('"', '\\');
+
+                                               if ($text =~ m/\G\s*($re)/gcs)
+                                               {
+                                                       $sub = $1;
+                                                       $text = substr $text, pos $text;
+                                               }
+
+                                               $line += () = $ws =~ /\n/g;
+
+                                               if (defined($sub) && length($sub)) {
+                                                       $line += () = $sub =~ /\n/g;
+
+                                                       $sub =~ s/^"//;
+                                                       $sub =~ s/"$//;
+                                                       $res .= $sub;
+                                               }
+                                       }
+                               }
+
+                               if (defined($res))
+                               {
+                                       $res = dec_json_str($res);
+
+                                       if ($res) {
+                                               $stringtable{$res} ||= [ ];
+                                               push @{$stringtable{$res}}, $position;
+                                       }
+                               }
+                       }
+               }
+       }
+
+       close F;
+}
+
 
 if( open C, "| msgcat -" )
 {
+       binmode C, ':utf8';
+
        printf C "msgid \"\"\nmsgstr \"Content-Type: text/plain; charset=UTF-8\"\n\n";
 
        foreach my $key ( sort keys %stringtable )

diff --git a/docs/api/modules/nixio.bin.html b/docs/api/modules/nixio.bin.html
index 48e6fcd8b86d55947cade2f2e46495320d4e0c5f..c8ef018317e46737dea9ee6cd73c1b5e5c8b2fe2 100644 (file)
--- a/docs/api/modules/nixio.bin.html
+++ b/docs/api/modules/nixio.bin.html
@@ -262,7 +262,7 @@
 <ul>
        
        <li>
-         buffer: Base 64 Encoded data
+         buffer: Base64 Encoded data
        </li>
        
 </ul>

diff --git a/libs/luci-lib-nixio/docsrc/nixio.bin.lua b/libs/luci-lib-nixio/docsrc/nixio.bin.lua
index 13e125d3cc6a0d5c93bf1f960b17762048da5f50..2a3b93c77e6495058bffd66e77b4152c90bf2b51 100644 (file)
--- a/libs/luci-lib-nixio/docsrc/nixio.bin.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.bin.lua
@@ -29,5 +29,5 @@ module "nixio.bin"
 --- Base64 decode a given buffer.
 -- @class function
 -- @name b64decode
--- @param buffer       Base 64 Encoded data
--- @return binary data
\ No newline at end of file
+-- @param buffer       Base64 Encoded data
+-- @return binary data

diff --git a/luci.mk b/luci.mk
index 935de61c3dd833b4c3409ccdce5275aa62fb7fda..5a6e5fdd2c0857142fd7fe79329b972d919a05e6 100644 (file)
--- a/luci.mk
+++ b/luci.mk
@@ -86,7 +86,7 @@ PKG_GITBRANCH?=$(if $(DUMP),x,$(strip $(shell \
 
 PKG_RELEASE?=1
 PKG_INSTALL:=$(if $(realpath src/Makefile),1)
-PKG_BUILD_DEPENDS += lua/host luci-base/host LUCI_CSSTIDY:csstidy/host $(LUCI_BUILD_DEPENDS)
+PKG_BUILD_DEPENDS += lua/host luci-base/host LUCI_CSSTIDY:csstidy/host LUCI_SRCDIET:luasrcdiet/host $(LUCI_BUILD_DEPENDS)
 PKG_CONFIG_DEPENDS += CONFIG_LUCI_SRCDIET CONFIG_LUCI_JSMIN CONFIG_LUCI_CSSTIDY
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
@@ -219,6 +219,7 @@ ifneq ($(LUCI_DEFAULTS),)
 define Package/$(PKG_NAME)/postinst
 [ -n "$${IPKG_INSTROOT}" ] || {$(foreach script,$(LUCI_DEFAULTS),
        (. /etc/uci-defaults/$(script)) && rm -f /etc/uci-defaults/$(script))
+       rm -f /tmp/luci-indexcache
        exit 0
 }
 endef

diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
index ea233091017d5e76c4147fb1e7c1bffec7bfcfc5..5019646611cdeeccba071198931c4622dcb753d3 100644 (file)
--- a/modules/luci-base/Makefile
+++ b/modules/luci-base/Makefile
@@ -14,13 +14,9 @@ LUCI_BASENAME:=base
 LUCI_TITLE:=LuCI core libraries
 LUCI_DEPENDS:=+lua +luci-lib-nixio +luci-lib-ip +rpcd +libubus-lua +luci-lib-jsonc +liblucihttp-lua +rpcd-mod-file +rpcd-mod-luci +cgi-io
 
-
-PKG_SOURCE:=v1.0.0.tar.gz
-PKG_SOURCE_URL:=https://github.com/jirutka/luasrcdiet/archive/
-PKG_HASH:=48162e63e77d009f5848f18a5cabffbdfc867d0e5e73c6d407f6af5d6880151b
 PKG_LICENSE:=MIT
 
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/luasrcdiet-1.0.0
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -41,11 +37,8 @@ endef
 
 define Host/Install
        $(INSTALL_DIR) $(1)/bin
-       $(INSTALL_DIR) $(1)/lib/lua/5.1
        $(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo
        $(INSTALL_BIN) src/jsmin $(1)/bin/jsmin
-       $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/luasrcdiet $(1)/bin/luasrcdiet
-       $(CP) $(HOST_BUILD_DIR)/luasrcdiet $(1)/lib/lua/5.1/
 endef
 
 $(eval $(call HostBuild))

diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js
index 1c6f843041854807a46c64f255f146744b77a703..180cd61a6d3e959479b8d0dc3884b7168fae18a7 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/form.js
+++ b/modules/luci-base/htdocs/luci-static/resources/form.js
@@ -765,6 +765,12 @@ var CBIAbstractValue = CBINode.extend({
                        this.ucioption || this.option);
        },
 
+       getUIElement: function(section_id) {
+               var node = this.map.findElement('id', this.cbid(section_id)),
+                   inst = node ? L.dom.findClassInstance(node) : null;
+               return (inst instanceof ui.AbstractElement) ? inst : null;
+       },
+
        cfgvalue: function(section_id, set_value) {
                if (section_id == null)
                        L.error('TypeError', 'Section ID required');
@@ -778,8 +784,8 @@ var CBIAbstractValue = CBINode.extend({
        },
 
        formvalue: function(section_id) {
-               var node = this.map.findElement('id', this.cbid(section_id));
-               return node ? L.dom.callClassMethod(node, 'getValue') : null;
+               var elem = this.getUIElement(section_id);
+               return elem ? elem.getValue() : null;
        },
 
        textvalue: function(section_id) {
@@ -796,8 +802,8 @@ var CBIAbstractValue = CBINode.extend({
        },
 
        isValid: function(section_id) {
-               var node = this.map.findElement('id', this.cbid(section_id));
-               return node ? L.dom.callClassMethod(node, 'isValid') : true;
+               var elem = this.getUIElement(section_id);
+               return elem ? elem.isValid() : true;
        },
 
        isActive: function(section_id) {
@@ -817,8 +823,8 @@ var CBIAbstractValue = CBINode.extend({
        },
 
        triggerValidation: function(section_id) {
-               var node = this.map.findElement('id', this.cbid(section_id));
-               return node ? L.dom.callClassMethod(node, 'triggerValidation') : true;
+               var elem = this.getUIElement(section_id);
+               return elem ? elem.triggerValidation() : true;
        },
 
        parse: function(section_id) {
@@ -1742,9 +1748,8 @@ var CBIFlagValue = CBIValue.extend({
        },
 
        formvalue: function(section_id) {
-               var node = this.map.findElement('id', this.cbid(section_id)),
-                   checked = node ? L.dom.callClassMethod(node, 'isChecked') : false;
-
+               var elem = this.getUIElement(section_id),
+                   checked = elem ? elem.isChecked() : false;
                return checked ? this.enabled : this.disabled;
        },
 

diff --git a/modules/luci-base/htdocs/luci-static/resources/fs.js b/modules/luci-base/htdocs/luci-static/resources/fs.js
index 8a96ea87e2e88294950f451cd5fa244e2a378992..e1bf4f874afbbace912857ea6f7882342afe0525 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/fs.js
+++ b/modules/luci-base/htdocs/luci-static/resources/fs.js
@@ -108,6 +108,31 @@ function handleRpcReply(expect, rc) {
        return rc;
 }
 
+function handleCgiIoReply(res) {
+       if (!res.ok || res.status != 200) {
+               var e = new Error(res.statusText);
+               switch (res.status) {
+               case 400:
+                       e.name = 'InvalidArgumentError';
+                       break;
+
+               case 403:
+                       e.name = 'PermissionError';
+                       break;
+
+               case 404:
+                       e.name = 'NotFoundError';
+                       break;
+
+               default:
+                       e.name = 'Error';
+               }
+               throw e;
+       }
+
+       return res.text();
+}
+
 /**
  * @class fs
  * @memberof LuCI
@@ -293,6 +318,76 @@ var FileSystem = L.Class.extend(/** @lends LuCI.fs.prototype */ {
 
                        return lines;
                });
+       },
+
+       /**
+        * Read the contents of the given file and return them, bypassing ubus.
+        *
+        * This function will read the requested file through the cgi-io
+        * helper applet at `/cgi-bin/cgi-download` which bypasses the ubus rpc
+        * transport. This is useful to fetch large file contents which might
+        * exceed the ubus message size limits or which contain binary data.
+        *
+        * The cgi-io helper will enforce the same access permission rules as
+        * the ubus based read call.
+        *
+        * @param {string} path
+        * The file path to read.
+        *
+        * @returns {Promise<string>}
+        * Returns a promise resolving to a string containing the file contents or
+        * rejecting with an error stating the failure reason.
+        */
+       read_direct: function(path) {
+               var postdata = 'sessionid=%s&path=%s'
+                       .format(encodeURIComponent(L.env.sessionid), encodeURIComponent(path));
+
+               return L.Request.post('/cgi-bin/cgi-download', postdata, {
+                       headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+               }).then(handleCgiIoReply);
+       },
+
+       /**
+        * Execute the specified command, bypassing ubus.
+        *
+        * Note: The `command` must be either the path to an executable,
+        * or a basename without arguments in which case it will be searched
+        * in $PATH. If specified, the values given in `params` will be passed
+        * as arguments to the command.
+        *
+        * This function will invoke the requested commands through the cgi-io
+        * helper applet at `/cgi-bin/cgi-exec` which bypasses the ubus rpc
+        * transport. This is useful to fetch large command outputs which might
+        * exceed the ubus message size limits or which contain binary data.
+        *
+        * The cgi-io helper will enforce the same access permission rules as
+        * the ubus based exec call.
+        *
+        * @param {string} command
+        * The command to invoke.
+        *
+        * @param {string[]} [params]
+        * The arguments to pass to the command.
+        *
+        * @returns {Promise<string>}
+        * Returns a promise resolving to the gathered command stdout output or
+        * rejecting with an error stating the failure reason.
+        */
+       exec_direct: function(command, params) {
+               var cmdstr = String(command)
+                       .replace(/\\/g, '\\\\').replace(/(\s)/g, '\\$1');
+
+               if (Array.isArray(params))
+                       for (var i = 0; i < params.length; i++)
+                               cmdstr += ' ' + String(params[i])
+                                       .replace(/\\/g, '\\\\').replace(/(\s)/g, '\\$1');
+
+               var postdata = 'sessionid=%s&command=%s'
+                       .format(encodeURIComponent(L.env.sessionid), encodeURIComponent(cmdstr));
+
+               return L.Request.post('/cgi-bin/cgi-exec', postdata, {
+                       headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+               }).then(handleCgiIoReply);
        }
 });
 

diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
index 504f592978b83475fb1f2bd402c2617fae83f582..68abb939fc63ad578b425fbbaabbf8467f645299 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -5,7 +5,7 @@
 
 var proto_errors = {
        CONNECT_FAILED:                 _('Connection attempt failed'),
-       INVALID_ADDRESS:                _('IP address in invalid'),
+       INVALID_ADDRESS:                _('IP address is invalid'),
        INVALID_GATEWAY:                _('Gateway address is invalid'),
        INVALID_LOCAL_ADDRESS:  _('Local IP address is invalid'),
        MISSING_ADDRESS:                _('IP address is missing'),

diff --git a/modules/luci-base/htdocs/luci-static/resources/protocol/static.js b/modules/luci-base/htdocs/luci-static/resources/protocol/static.js
index 9039acd5f3ca43ff134b0a0b5cb93eea7383c66d..2d70ae681fa394f3acb82a16bcdd83f82b0f522b 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/protocol/static.js
+++ b/modules/luci-base/htdocs/luci-static/resources/protocol/static.js
@@ -195,7 +195,7 @@ return network.registerProtocol('static', {
                        var n = parseInt(value, 16);
 
                        if (!/^(0x)?[0-9a-fA-F]+$/.test(value) || isNaN(n) || n >= 0xffffffff)
-                               return _('Expecting an hexadecimal assignment hint');
+                               return _('Expecting a hexadecimal assignment hint');
 
                        return true;
                };

diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js
index 31f89339c4fdbb4545d478ff84a4ba1894a8783f..5fa75c3f66cd6a26d6ee88e172d054194f113375 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/ui.js
+++ b/modules/luci-base/htdocs/luci-static/resources/ui.js
@@ -457,9 +457,9 @@ var UIDropdown = UIElement.extend({
                                'placeholder': this.options.custom_placeholder || this.options.placeholder
                        });
 
-                       if (this.options.datatype)
-                               L.ui.addValidator(createEl, this.options.datatype,
-                                                 true, null, 'blur', 'keyup');
+                       if (this.options.datatype || this.options.validate)
+                               L.ui.addValidator(createEl, this.options.datatype || 'string',
+                                                 true, this.options.validate, 'blur', 'keyup');
 
                        sb.lastElementChild.appendChild(E('li', { 'data-value': '-' }, createEl));
                }
@@ -917,6 +917,33 @@ var UIDropdown = UIElement.extend({
                }
        },
 
+       createChoiceElement: function(sb, value, label) {
+               var tpl = sb.querySelector(this.options.create_template),
+                   markup = null;
+
+               if (tpl)
+                       markup = (tpl.textContent || tpl.innerHTML || tpl.firstChild.data).replace(/^<!--|-->$/, '').trim();
+               else
+                       markup = '<li data-value="{{value}}"><span data-label-placeholder="true" /></li>';
+
+               var new_item = E(markup.replace(/{{value}}/g, '%h'.format(value))),
+                   placeholder = new_item.querySelector('[data-label-placeholder]');
+
+               if (placeholder) {
+                       var content = E('span', {}, label || this.choices[value] || [ value ]);
+
+                       while (content.firstChild)
+                               placeholder.parentNode.insertBefore(content.firstChild, placeholder);
+
+                       placeholder.parentNode.removeChild(placeholder);
+               }
+
+               if (this.options.multiple)
+                       this.transformItem(sb, new_item);
+
+               return new_item;
+       },
+
        createItems: function(sb, value) {
                var sbox = this,
                    val = (value || '').trim(),
@@ -936,20 +963,9 @@ var UIDropdown = UIElement.extend({
                        });
 
                        if (!new_item) {
-                               var markup,
-                                   tpl = sb.querySelector(sbox.options.create_template);
-
-                               if (tpl)
-                                       markup = (tpl.textContent || tpl.innerHTML || tpl.firstChild.data).replace(/^<!--|-->$/, '').trim();
-                               else
-                                       markup = '<li data-value="{{value}}">{{value}}</li>';
-
-                               new_item = E(markup.replace(/{{value}}/g, '%h'.format(item)));
+                               new_item = sbox.createChoiceElement(sb, item);
 
-                               if (sbox.options.multiple) {
-                                       sbox.transformItem(sb, new_item);
-                               }
-                               else {
+                               if (!sbox.options.multiple) {
                                        var old = ul.querySelector('li[created]');
                                        if (old)
                                                ul.removeChild(old);
@@ -965,6 +981,54 @@ var UIDropdown = UIElement.extend({
                });
        },
 
+       clearChoices: function(reset_value) {
+               var ul = this.node.querySelector('ul'),
+                   lis = ul ? ul.querySelectorAll('li[data-value]') : [],
+                   len = lis.length - (this.options.create ? 1 : 0),
+                   val = reset_value ? null : this.getValue();
+
+               for (var i = 0; i < len; i++) {
+                       var lival = lis[i].getAttribute('data-value');
+                       if (val == null ||
+                               (!this.options.multiple && val != lival) ||
+                               (this.options.multiple && val.indexOf(lival) == -1))
+                               ul.removeChild(lis[i]);
+               }
+
+               if (reset_value)
+                       this.setValues(this.node, {});
+       },
+
+       addChoices: function(values, labels) {
+               var sb = this.node,
+                   ul = sb.querySelector('ul'),
+                   lis = ul ? ul.querySelectorAll('li[data-value]') : [];
+
+               if (!Array.isArray(values))
+                       values = L.toArray(values);
+
+               if (!L.isObject(labels))
+                       labels = {};
+
+               for (var i = 0; i < values.length; i++) {
+                       var found = false;
+
+                       for (var j = 0; j < lis.length; j++) {
+                               if (lis[j].getAttribute('data-value') === values[i]) {
+                                       found = true;
+                                       break;
+                               }
+                       }
+
+                       if (found)
+                               continue;
+
+                       ul.insertBefore(
+                               this.createChoiceElement(sb, values[i], labels[values[i]]),
+                               ul.lastElementChild);
+               }
+       },
+
        closeAllDropdowns: function() {
                document.querySelectorAll('.cbi-dropdown[open]').forEach(function(s) {
                        s.dispatchEvent(new CustomEvent('cbi-dropdown-close', {}));
@@ -1270,9 +1334,9 @@ var UIDynamicList = UIElement.extend({
                        dl.lastElementChild.appendChild(inputEl);
                        dl.lastElementChild.appendChild(E('div', { 'class': 'cbi-button cbi-button-add' }, '+'));
 
-                       if (this.options.datatype)
-                               L.ui.addValidator(inputEl, this.options.datatype,
-                                                 true, null, 'blur', 'keyup');
+                       if (this.options.datatype || this.options.validate)
+                               L.ui.addValidator(inputEl, this.options.datatype || 'string',
+                                                 true, this.options.validate, 'blur', 'keyup');
                }
 
                for (var i = 0; i < this.values.length; i++)
@@ -2779,6 +2843,8 @@ return L.Class.extend({
                }, this.varargs(arguments, 2, ctx));
        },
 
+       AbstractElement: UIElement,
+
        /* Widgets */
        Textfield: UITextfield,
        Textarea: UITextarea,

diff --git a/modules/luci-base/luasrc/controller/admin/index.lua b/modules/luci-base/luasrc/controller/admin/index.lua
index 0cebfa4f57130dca52f57da05e7d8596f906b66c..68bbd38a71428ea5b02b423f6ff014d87c3a524f 100644 (file)
--- a/modules/luci-base/luasrc/controller/admin/index.lua
+++ b/modules/luci-base/luasrc/controller/admin/index.lua
@@ -3,85 +3,6 @@
 
 module("luci.controller.admin.index", package.seeall)
 
-function index()
-       function toplevel_page(page, preflookup, preftarget)
-               if preflookup and preftarget then
-                       if lookup(preflookup) then
-                               page.target = preftarget
-                       end
-               end
-
-               if not page.target then
-                       page.target = firstchild()
-               end
-       end
-
-       local uci = require("luci.model.uci").cursor()
-
-       local root = node()
-       if not root.target then
-               root.target = alias("admin")
-               root.index = true
-       end
-
-       local page   = node("admin")
-
-       page.title   = _("Administration")
-       page.order   = 10
-       page.sysauth = "root"
-       page.sysauth_authenticator = "htmlauth"
-       page.ucidata = true
-       page.index = true
-       page.target = firstnode()
-
-       -- Empty menu tree to be populated by addons and modules
-
-       page = node("admin", "status")
-       page.title = _("Status")
-       page.order = 10
-       page.index = true
-       -- overview is from mod-admin-full
-       toplevel_page(page, "admin/status/overview", alias("admin", "status", "overview"))
-
-       page = node("admin", "system")
-       page.title = _("System")
-       page.order = 20
-       page.index = true
-       -- system/system is from mod-admin-full
-       toplevel_page(page, "admin/system/system", alias("admin", "system", "system"))
-
-       -- Only used if applications add items
-       page = node("admin", "vpn")
-       page.title = _("VPN")
-       page.order = 30
-       page.index = true
-       toplevel_page(page, false, false)
-
-       -- Only used if applications add items
-       page = node("admin", "services")
-       page.title = _("Services")
-       page.order = 40
-       page.index = true
-       toplevel_page(page, false, false)
-
-       -- Even for mod-admin-full network just uses first submenu item as landing
-       page = node("admin", "network")
-       page.title = _("Network")
-       page.order = 50
-       page.index = true
-       toplevel_page(page, false, false)
-
-       page = entry({"admin", "translations"}, call("action_translations"), nil)
-       page.leaf = true
-
-       page = entry({"admin", "ubus"}, call("action_ubus"), nil)
-       page.sysauth = false
-       page.leaf = true
-
-       -- Logout is last
-       entry({"admin", "logout"}, call("action_logout"), _("Logout"), 999)
-end
-
 function action_logout()
        local dsp = require "luci.dispatcher"
        local utl = require "luci.util"

diff --git a/modules/luci-base/luasrc/controller/admin/uci.lua b/modules/luci-base/luasrc/controller/admin/uci.lua
index 6b19c62f81c96f96da9506343a2a0f4acb06bfbc..7aad10d58a280370b6b0066f64a58da1b62addf2 100644 (file)
--- a/modules/luci-base/luasrc/controller/admin/uci.lua
+++ b/modules/luci-base/luasrc/controller/admin/uci.lua
@@ -4,32 +4,6 @@
 
 module("luci.controller.admin.uci", package.seeall)
 
-function index()
-       local redir = luci.http.formvalue("redir", true)
-               or table.concat(luci.dispatcher.context.request, "/")
-
-       entry({"admin", "uci"}, nil, _("Configuration"))
-       entry({"admin", "uci", "revert"}, post("action_revert"), nil)
-
-       local node
-       local authen = function(checkpass, allowed_users)
-               return "root", luci.http.formvalue("sid")
-       end
-
-       node = entry({"admin", "uci", "apply_rollback"}, post("action_apply_rollback"), nil)
-       node.cors = true
-       node.sysauth_authenticator = authen
-
-       node = entry({"admin", "uci", "apply_unchecked"}, post("action_apply_unchecked"), nil)
-       node.cors = true
-       node.sysauth_authenticator = authen
-
-       node = entry({"admin", "uci", "confirm"}, call("action_confirm"), nil)
-       node.cors = true
-       node.sysauth = false
-end
-
-
 local function ubus_state_to_http(errstr)
        local map = {
                ["Invalid command"]   = 400,

diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua
index b43b94fdef9b6a56200ab36ffda919db89a39c0b..d4293422b5d92bbadce0a1794ac9204e45a39906 100644 (file)
--- a/modules/luci-base/luasrc/dispatcher.lua
+++ b/modules/luci-base/luasrc/dispatcher.lua
@@ -17,138 +17,336 @@ _M.fs = fs
 -- Index table
 local index = nil
 
--- Fastindex
-local fi
+local function check_fs_depends(fs)
+       local fs = require "nixio.fs"
+
+       for path, kind in pairs(fs) do
+               if kind == "directory" then
+                       local empty = true
+                       for entry in (fs.dir(path) or function() end) do
+                               empty = false
+                               break
+                       end
+                       if empty then
+                               return false
+                       end
+               elseif kind == "executable" then
+                       if fs.stat(path, "type") ~= "reg" or not fs.access(path, "x") then
+                               return false
+                       end
+               elseif kind == "file" then
+                       if fs.stat(path, "type") ~= "reg" then
+                               return false
+                       end
+               end
+       end
 
+       return true
+end
 
-function build_url(...)
-       local path = {...}
-       local url = { http.getenv("SCRIPT_NAME") or "" }
+local function check_uci_depends_options(conf, s, opts)
+       local uci = require "luci.model.uci"
 
-       local p
-       for _, p in ipairs(path) do
-               if p:match("^[a-zA-Z0-9_%-%.%%/,;]+$") then
-                       url[#url+1] = "/"
-                       url[#url+1] = p
+       if type(opts) == "string" then
+               return (s[".type"] == opts)
+       elseif opts == true then
+               for option, value in pairs(s) do
+                       if option:byte(1) ~= 46 then
+                               return true
+                       end
+               end
+       elseif type(opts) == "table" then
+               for option, value in pairs(opts) do
+                       local sval = s[option]
+                       if type(sval) == "table" then
+                               local found = false
+                               for _, v in ipairs(sval) do
+                                       if v == value then
+                                               found = true
+                                               break
+                                       end
+                               end
+                               if not found then
+                                       return false
+                               end
+                       elseif value == true then
+                               if sval == nil then
+                                       return false
+                               end
+                       else
+                               if sval ~= value then
+                                       return false
+                               end
+                       end
                end
        end
 
-       if #path == 0 then
-               url[#url+1] = "/"
+       return true
+end
+
+local function check_uci_depends_section(conf, sect)
+       local uci = require "luci.model.uci"
+
+       for section, options in pairs(sect) do
+               local stype = section:match("^@([A-Za-z0-9_%-]+)$")
+               if stype then
+                       local found = false
+                       uci:foreach(conf, stype, function(s)
+                               if check_uci_depends_options(conf, s, options) then
+                                       found = true
+                                       return false
+                               end
+                       end)
+                       if not found then
+                               return false
+                       end
+               else
+                       local s = uci:get_all(conf, section)
+                       if not s or not check_uci_depends_options(conf, s, options) then
+                               return false
+                       end
+               end
        end
 
-       return table.concat(url, "")
+       return true
 end
 
-function _ordered_children(node)
-       local name, child, children = nil, nil, {}
+local function check_uci_depends(conf)
+       local uci = require "luci.model.uci"
 
-       for name, child in pairs(node.nodes) do
-               children[#children+1] = {
-                       name  = name,
-                       node  = child,
-                       order = child.order or 100
-               }
+       for config, values in pairs(conf) do
+               if values == true then
+                       local found = false
+                       uci:foreach(config, nil, function(s)
+                               found = true
+                               return false
+                       end)
+                       if not found then
+                               return false
+                       end
+               elseif type(values) == "table" then
+                       if not check_uci_depends_section(config, values) then
+                               return false
+                       end
+               end
        end
 
-       table.sort(children, function(a, b)
-               if a.order == b.order then
-                       return a.name < b.name
-               else
-                       return a.order < b.order
+       return true
+end
+
+local function check_depends(spec)
+       if type(spec.depends) ~= "table" then
+               return true
+       end
+
+       if type(spec.depends.fs) == "table" and not check_fs_depends(spec.depends.fs) then
+               local satisfied = false
+               local alternatives = (#spec.depends.fs > 0) and spec.depends.fs or { spec.depends.fs }
+               for _, alternative in ipairs(alternatives) do
+                       if check_fs_depends(alternative) then
+                               satisfied = true
+                               break
+                       end
                end
-       end)
+               if not satisfied then
+                       return false
+               end
+       end
 
-       return children
+       if type(spec.depends.uci) == "table" then
+               local satisfied = false
+               local alternatives = (#spec.depends.uci > 0) and spec.depends.uci or { spec.depends.uci }
+               for _, alternative in ipairs(alternatives) do
+                       if check_uci_depends(alternative) then
+                               satisfied = true
+                               break
+                       end
+               end
+               if not satisfied then
+                       return false
+               end
+       end
+
+       return true
 end
 
-local function dependencies_satisfied(node)
-       if type(node.file_depends) == "table" then
-               for _, file in ipairs(node.file_depends) do
-                       local ftype = fs.stat(file, "type")
-                       if ftype == "dir" then
-                               local empty = true
-                               for e in (fs.dir(file) or function() end) do
-                                       empty = false
-                               end
-                               if empty then
-                                       return false
-                               end
-                       elseif ftype == nil then
-                               return false
-                       end
+local function target_to_json(target, module)
+       local action
+
+       if target.type == "call" then
+               action = {
+                       ["type"] = "call",
+                       ["module"] = module,
+                       ["function"] = target.name,
+                       ["parameters"] = target.argv
+               }
+       elseif target.type == "view" then
+               action = {
+                       ["type"] = "view",
+                       ["path"] = target.view
+               }
+       elseif target.type == "template" then
+               action = {
+                       ["type"] = "template",
+                       ["path"] = target.view
+               }
+       elseif target.type == "cbi" then
+               action = {
+                       ["type"] = "cbi",
+                       ["path"] = target.model
+               }
+       elseif target.type == "form" then
+               action = {
+                       ["type"] = "form",
+                       ["path"] = target.model
+               }
+       elseif target.type == "firstchild" then
+               action = {
+                       ["type"] = "firstchild"
+               }
+       elseif target.type == "firstnode" then
+               action = {
+                       ["type"] = "firstchild",
+                       ["recurse"] = true
+               }
+       elseif target.type == "arcombine" then
+               if type(target.targets) == "table" then
+                       action = {
+                               ["type"] = "arcombine",
+                               ["targets"] = {
+                                       target_to_json(target.targets[1], module),
+                                       target_to_json(target.targets[2], module)
+                               }
+                       }
                end
+       elseif target.type == "alias" then
+               action = {
+                       ["type"] = "alias",
+                       ["path"] = table.concat(target.req, "/")
+               }
+       elseif target.type == "rewrite" then
+               action = {
+                       ["type"] = "rewrite",
+                       ["path"] = table.concat(target.req, "/"),
+                       ["remove"] = target.n
+               }
        end
 
-       if type(node.uci_depends) == "table" then
-               for config, expect_sections in pairs(node.uci_depends) do
-                       if type(expect_sections) == "table" then
-                               for section, expect_options in pairs(expect_sections) do
-                                       if type(expect_options) == "table" then
-                                               for option, expect_value in pairs(expect_options) do
-                                                       local val = uci:get(config, section, option)
-                                                       if expect_value == true and val == nil then
-                                                               return false
-                                                       elseif type(expect_value) == "string" then
-                                                               if type(val) == "table" then
-                                                                       local found = false
-                                                                       for _, subval in ipairs(val) do
-                                                                               if subval == expect_value then
-                                                                                       found = true
-                                                                               end
-                                                                       end
-                                                                       if not found then
-                                                                               return false
-                                                                       end
-                                                               elseif val ~= expect_value then
-                                                                       return false
-                                                               end
-                                                       end
-                                               end
+       if target.post and action then
+               action.post = target.post
+       end
+
+       return action
+end
+
+local function tree_to_json(node, json)
+       local fs = require "nixio.fs"
+       local util = require "luci.util"
+
+       if type(node.nodes) == "table" then
+               for subname, subnode in pairs(node.nodes) do
+                       local spec = {
+                               title = util.striptags(subnode.title),
+                               order = subnode.order
+                       }
+
+                       if subnode.leaf then
+                               spec.wildcard = true
+                       end
+
+                       if subnode.cors then
+                               spec.cors = true
+                       end
+
+                       if subnode.setuser then
+                               spec.setuser = subnode.setuser
+                       end
+
+                       if subnode.setgroup then
+                               spec.setgroup = subnode.setgroup
+                       end
+
+                       if type(subnode.target) == "table" then
+                               spec.action = target_to_json(subnode.target, subnode.module)
+                       end
+
+                       if type(subnode.file_depends) == "table" then
+                               for _, v in ipairs(subnode.file_depends) do
+                                       spec.depends = spec.depends or {}
+                                       spec.depends.fs = spec.depends.fs or {}
+
+                                       local ft = fs.stat(v, "type")
+                                       if ft == "dir" then
+                                               spec.depends.fs[v] = "directory"
+                                       elseif v:match("/s?bin/") then
+                                               spec.depends.fs[v] = "executable"
                                        else
-                                               local val = uci:get(config, section)
-                                               if expect_options == true and val == nil then
-                                                       return false
-                                               elseif type(expect_options) == "string" and val ~= expect_options then
-                                                       return false
-                                               end
+                                               spec.depends.fs[v] = "file"
                                        end
                                end
-                       elseif expect_sections == true then
-                               if not uci:get_first(config) then
-                                       return false
+                       end
+
+                       if type(subnode.uci_depends) == "table" then
+                               for k, v in pairs(subnode.uci_depends) do
+                                       spec.depends = spec.depends or {}
+                                       spec.depends.uci = spec.depends.uci or {}
+                                       spec.depends.uci[k] = v
                                end
                        end
+
+                       if (subnode.sysauth_authenticator ~= nil) or
+                          (subnode.sysauth ~= nil and subnode.sysauth ~= false)
+                       then
+                               if subnode.sysauth_authenticator == "htmlauth" then
+                                       spec.auth = {
+                                               login = true,
+                                               methods = { "cookie:sysauth" }
+                                       }
+                               elseif subname == "rpc" and subnode.module == "luci.controller.rpc" then
+                                       spec.auth = {
+                                               login = false,
+                                               methods = { "param:auth", "cookie:sysauth" }
+                                       }
+                               elseif subnode.module == "luci.controller.admin.uci" then
+                                       spec.auth = {
+                                               login = false,
+                                               methods = { "param:sid" }
+                                       }
+                               end
+                       elseif subnode.sysauth == false then
+                               spec.auth = {}
+                       end
+
+                       if not spec.action then
+                               spec.title = nil
+                       end
+
+                       spec.satisfied = check_depends(spec)
+                       json.children = json.children or {}
+                       json.children[subname] = tree_to_json(subnode, spec)
                end
        end
 
-       return true
+       return json
 end
 
-function node_visible(node)
-   if node then
-         return not (
-                (not dependencies_satisfied(node)) or
-                (not node.title or #node.title == 0) or
-                (not node.target or node.hidden == true) or
-                (type(node.target) == "table" and node.target.type == "firstchild" and
-                 (type(node.nodes) ~= "table" or not next(node.nodes)))
-         )
-   end
-   return false
-end
+function build_url(...)
+       local path = {...}
+       local url = { http.getenv("SCRIPT_NAME") or "" }
 
-function node_childs(node)
-       local rv = { }
-       if node then
-               local _, child
-               for _, child in ipairs(_ordered_children(node)) do
-                       if node_visible(child.node) then
-                               rv[#rv+1] = child.name
-                       end
+       local p
+       for _, p in ipairs(path) do
+               if p:match("^[a-zA-Z0-9_%-%.%%/,;]+$") then
+                       url[#url+1] = "/"
+                       url[#url+1] = p
                end
        end
-       return rv
+
+       if #path == 0 then
+               url[#url+1] = "/"
+       end
+
+       return table.concat(url, "")
 end
 
 
@@ -185,6 +383,38 @@ function error500(message)
        return false
 end
 
+local function determine_request_language()
+       local conf = require "luci.config"
+       assert(conf.main, "/etc/config/luci seems to be corrupt, unable to find section 'main'")
+
+       local lang = conf.main.lang or "auto"
+       if lang == "auto" then
+               local aclang = http.getenv("HTTP_ACCEPT_LANGUAGE") or ""
+               for aclang in aclang:gmatch("[%w_-]+") do
+                       local country, culture = aclang:match("^([a-z][a-z])[_-]([a-zA-Z][a-zA-Z])$")
+                       if country and culture then
+                               local cc = "%s_%s" %{ country, culture:lower() }
+                               if conf.languages[cc] then
+                                       lang = cc
+                                       break
+                               elseif conf.languages[country] then
+                                       lang = country
+                                       break
+                               end
+                       elseif conf.languages[aclang] then
+                               lang = aclang
+                               break
+                       end
+               end
+       end
+
+       if lang == "auto" then
+               lang = i18n.default
+       end
+
+       i18n.setlanguage(lang)
+end
+
 function httpdispatch(request, prefix)
        http.context.request = request
 
@@ -204,6 +434,8 @@ function httpdispatch(request, prefix)
                r[#r+1] = node
        end
 
+       determine_request_language()
+
        local stat, err = util.coxpcall(function()
                dispatch(context.request)
        end, error500)
@@ -306,189 +538,245 @@ local function session_setup(user, pass, allowed_users)
        return nil, nil
 end
 
-function dispatch(request)
-       --context._disable_memtrace = require "luci.debug".trap_memtrace("l")
-       local ctx = context
-       ctx.path = request
+local function check_authentication(method)
+       local auth_type, auth_param = method:match("^(%w+):(.+)$")
+       local sid, sdat
 
-       local conf = require "luci.config"
-       assert(conf.main,
-               "/etc/config/luci seems to be corrupt, unable to find section 'main'")
+       if auth_type == "cookie" then
+               sid = http.getcookie(auth_param)
+       elseif auth_type == "param" then
+               sid = http.formvalue(auth_param)
+       end
 
-       local i18n = require "luci.i18n"
-       local lang = conf.main.lang or "auto"
-       if lang == "auto" then
-               local aclang = http.getenv("HTTP_ACCEPT_LANGUAGE") or ""
-               for aclang in aclang:gmatch("[%w_-]+") do
-                       local country, culture = aclang:match("^([a-z][a-z])[_-]([a-zA-Z][a-zA-Z])$")
-                       if country and culture then
-                               local cc = "%s_%s" %{ country, culture:lower() }
-                               if conf.languages[cc] then
-                                       lang = cc
-                                       break
-                               elseif conf.languages[country] then
-                                       lang = country
-                                       break
-                               end
-                       elseif conf.languages[aclang] then
-                               lang = aclang
-                               break
-                       end
+       return session_retrieve(sid)
+end
+
+local function get_children(node)
+       local children = {}
+
+       if not node.wildcard and type(node.children) == "table" then
+               for name, child in pairs(node.children) do
+                       children[#children+1] = {
+                               name  = name,
+                               node  = child,
+                               order = child.order or 1000
+                       }
                end
-       end
-       if lang == "auto" then
-               lang = i18n.default
-       end
-       i18n.setlanguage(lang)
 
-       local c = ctx.tree
-       local stat
-       if not c then
-               c = createtree()
+               table.sort(children, function(a, b)
+                       if a.order == b.order then
+                               return a.name < b.name
+                       else
+                               return a.order < b.order
+                       end
+               end)
        end
 
-       local track = {}
-       local args = {}
-       ctx.args = args
-       ctx.requestargs = ctx.requestargs or args
-       local n
-       local preq = {}
-       local freq = {}
+       return children
+end
 
-       for i, s in ipairs(request) do
-               preq[#preq+1] = s
-               freq[#freq+1] = s
-               c = c.nodes[s]
-               n = i
-               if not c then
-                       break
+local function find_subnode(root, prefix, recurse, descended)
+       local children = get_children(root)
+
+       if #children > 0 and (not descended or recurse) then
+               local sub_path = { unpack(prefix) }
+
+               if recurse == false then
+                       recurse = nil
                end
 
-               util.update(track, c)
+               for _, child in ipairs(children) do
+                       sub_path[#prefix+1] = child.name
+
+                       local res_path = find_subnode(child.node, sub_path, recurse, true)
 
-               if c.leaf then
-                       break
+                       if res_path then
+                               return res_path
+                       end
                end
        end
 
-       if c and c.leaf then
-               for j=n+1, #request do
-                       args[#args+1] = request[j]
-                       freq[#freq+1] = request[j]
+       if descended then
+               if not recurse or
+                  root.action.type == "cbi" or
+                  root.action.type == "form" or
+                  root.action.type == "view" or
+                  root.action.type == "template" or
+                  root.action.type == "arcombine"
+               then
+                       return prefix
                end
        end
+end
 
-       ctx.requestpath = ctx.requestpath or freq
-       ctx.path = preq
+local function merge_trees(node_a, node_b)
+       for k, v in pairs(node_b) do
+               if k == "children" then
+                       node_a.children = node_a.children or {}
 
-       -- Init template engine
-       if (c and c.index) or not track.notemplate then
-               local tpl = require("luci.template")
-               local media = track.mediaurlbase or luci.config.main.mediaurlbase
-               if not pcall(tpl.Template, "themes/%s/header" % fs.basename(media)) then
-                       media = nil
-                       for name, theme in pairs(luci.config.themes) do
-                               if name:sub(1,1) ~= "." and pcall(tpl.Template,
-                                "themes/%s/header" % fs.basename(theme)) then
-                                       media = theme
-                               end
+                       for name, spec in pairs(v) do
+                               node_a.children[name] = merge_trees(node_a.children[name] or {}, spec)
                        end
-                       assert(media, "No valid theme found")
+               else
+                       node_a[k] = v
                end
+       end
+       return node_a
+end
 
-               local function _ifattr(cond, key, val, noescape)
-                       if cond then
-                               local env = getfenv(3)
-                               local scope = (type(env.self) == "table") and env.self
-                               if type(val) == "table" then
-                                       if not next(val) then
-                                               return ''
-                                       else
-                                               val = util.serialize_json(val)
-                                       end
-                               end
-
-                               val = tostring(val or
-                                       (type(env[key]) ~= "function" and env[key]) or
-                                       (scope and type(scope[key]) ~= "function" and scope[key]) or "")
+function menu_json()
+       local tree = context.tree or createtree()
+       local lua_tree = tree_to_json(tree, {
+               action = {
+                       ["type"] = "firstchild",
+                       ["recurse"] = true
+               }
+       })
 
-                               if noescape ~= true then
-                                       val = util.pcdata(val)
-                               end
+       local json_tree = createtree_json()
+       return merge_trees(lua_tree, json_tree)
+end
 
-                               return string.format(' %s="%s"', tostring(key), val)
-                       else
-                               return ''
+local function init_template_engine(ctx)
+       local tpl = require "luci.template"
+       local media = luci.config.main.mediaurlbase
+
+       if not pcall(tpl.Template, "themes/%s/header" % fs.basename(media)) then
+               media = nil
+               for name, theme in pairs(luci.config.themes) do
+                       if name:sub(1,1) ~= "." and pcall(tpl.Template,
+                        "themes/%s/header" % fs.basename(theme)) then
+                               media = theme
                        end
                end
+               assert(media, "No valid theme found")
+       end
 
-               tpl.context.viewns = setmetatable({
-                  write       = http.write;
-                  include     = function(name) tpl.Template(name):render(getfenv(2)) end;
-                  translate   = i18n.translate;
-                  translatef  = i18n.translatef;
-                  export      = function(k, v) if tpl.context.viewns[k] == nil then tpl.context.viewns[k] = v end end;
-                  striptags   = util.striptags;
-                  pcdata      = util.pcdata;
-                  media       = media;
-                  theme       = fs.basename(media);
-                  resource    = luci.config.main.resourcebase;
-                  ifattr      = function(...) return _ifattr(...) end;
-                  attr        = function(...) return _ifattr(true, ...) end;
-                  url         = build_url;
-               }, {__index=function(tbl, key)
-                       if key == "controller" then
-                               return build_url()
-                       elseif key == "REQUEST_URI" then
-                               return build_url(unpack(ctx.requestpath))
-                       elseif key == "FULL_REQUEST_URI" then
-                               local url = { http.getenv("SCRIPT_NAME") or "", http.getenv("PATH_INFO") }
-                               local query = http.getenv("QUERY_STRING")
-                               if query and #query > 0 then
-                                       url[#url+1] = "?"
-                                       url[#url+1] = query
+       local function _ifattr(cond, key, val, noescape)
+               if cond then
+                       local env = getfenv(3)
+                       local scope = (type(env.self) == "table") and env.self
+                       if type(val) == "table" then
+                               if not next(val) then
+                                       return ''
+                               else
+                                       val = util.serialize_json(val)
                                end
-                               return table.concat(url, "")
-                       elseif key == "token" then
-                               return ctx.authtoken
-                       else
-                               return rawget(tbl, key) or _G[key]
                        end
-               end})
-       end
 
-       track.dependent = (track.dependent ~= false)
-       assert(not track.dependent or not track.auto,
-               "Access Violation\nThe page at '" .. table.concat(request, "/") .. "/' " ..
-               "has no parent node so the access to this location has been denied.\n" ..
-               "This is a software bug, please report this message at " ..
-               "https://github.com/openwrt/luci/issues"
-       )
+                       val = tostring(val or
+                               (type(env[key]) ~= "function" and env[key]) or
+                               (scope and type(scope[key]) ~= "function" and scope[key]) or "")
 
-       if track.sysauth and not ctx.authsession then
-               local authen = track.sysauth_authenticator
-               local _, sid, sdat, default_user, allowed_users
+                       if noescape ~= true then
+                               val = util.pcdata(val)
+                       end
 
-               if type(authen) == "string" and authen ~= "htmlauth" then
-                       error500("Unsupported authenticator %q configured" % authen)
-                       return
+                       return string.format(' %s="%s"', tostring(key), val)
+               else
+                       return ''
                end
+       end
 
-               if type(track.sysauth) == "table" then
-                       default_user, allowed_users = nil, track.sysauth
+       tpl.context.viewns = setmetatable({
+               write       = http.write;
+               include     = function(name) tpl.Template(name):render(getfenv(2)) end;
+               translate   = i18n.translate;
+               translatef  = i18n.translatef;
+               export      = function(k, v) if tpl.context.viewns[k] == nil then tpl.context.viewns[k] = v end end;
+               striptags   = util.striptags;
+               pcdata      = util.pcdata;
+               media       = media;
+               theme       = fs.basename(media);
+               resource    = luci.config.main.resourcebase;
+               ifattr      = function(...) return _ifattr(...) end;
+               attr        = function(...) return _ifattr(true, ...) end;
+               url         = build_url;
+       }, {__index=function(tbl, key)
+               if key == "controller" then
+                       return build_url()
+               elseif key == "REQUEST_URI" then
+                       return build_url(unpack(ctx.requestpath))
+               elseif key == "FULL_REQUEST_URI" then
+                       local url = { http.getenv("SCRIPT_NAME") or "", http.getenv("PATH_INFO") }
+                       local query = http.getenv("QUERY_STRING")
+                       if query and #query > 0 then
+                               url[#url+1] = "?"
+                               url[#url+1] = query
+                       end
+                       return table.concat(url, "")
+               elseif key == "token" then
+                       return ctx.authtoken
                else
-                       default_user, allowed_users = track.sysauth, { track.sysauth }
+                       return rawget(tbl, key) or _G[key]
                end
+       end})
 
-               if type(authen) == "function" then
-                       _, sid = authen(sys.user.checkpasswd, allowed_users)
-               else
-                       sid = http.getcookie("sysauth")
+       return tpl
+end
+
+function dispatch(request)
+       --context._disable_memtrace = require "luci.debug".trap_memtrace("l")
+       local ctx = context
+
+       local auth, cors, suid, sgid
+       local menu = menu_json()
+       local page = menu
+
+       local requested_path_full = {}
+       local requested_path_node = {}
+       local requested_path_args = {}
+
+       for i, s in ipairs(request) do
+               if type(page.children) ~= "table" or not page.children[s] then
+                       page = nil
+                       break
+               end
+
+               if not page.children[s].satisfied then
+                       page = nil
+                       break
                end
 
-               sid, sdat = session_retrieve(sid, allowed_users)
+               page = page.children[s]
+               auth = page.auth or auth
+               cors = page.cors or cors
+               suid = page.setuser or suid
+               sgid = page.setgroup or sgid
 
-               if not (sid and sdat) and authen == "htmlauth" then
+               requested_path_full[i] = s
+               requested_path_node[i] = s
+
+               if page.wildcard then
+                       for j = i + 1, #request do
+                               requested_path_args[j - i] = request[j]
+                               requested_path_full[j] = request[j]
+                       end
+                       break
+               end
+       end
+
+       local tpl = init_template_engine(ctx)
+
+       ctx.args = requested_path_args
+       ctx.path = requested_path_node
+       ctx.dispatched = page
+
+       ctx.requestpath = ctx.requestpath or requested_path_full
+       ctx.requestargs = ctx.requestargs or requested_path_args
+       ctx.requested = ctx.requested or page
+
+       if type(auth) == "table" and type(auth.methods) == "table" and #auth.methods > 0 then
+               local sid, sdat
+               for _, method in ipairs(auth.methods) do
+                       sid, sdat = check_authentication(method)
+
+                       if sid and sdat then
+                               break
+                       end
+               end
+
+               if not (sid and sdat) and auth.login then
                        local user = http.getenv("HTTP_AUTH_USER")
                        local pass = http.getenv("HTTP_AUTH_PASS")
 
@@ -497,27 +785,23 @@ function dispatch(request)
                                pass = http.formvalue("luci_password")
                        end
 
-                       sid, sdat = session_setup(user, pass, allowed_users)
+                       sid, sdat = session_setup(user, pass, { "root" })
 
                        if not sid then
-                               local tmpl = require "luci.template"
-
                                context.path = {}
 
                                http.status(403, "Forbidden")
                                http.header("X-LuCI-Login-Required", "yes")
-                               tmpl.render(track.sysauth_template or "sysauth", {
-                                       duser = default_user,
-                                       fuser = user
-                               })
 
-                               return
+                               return tpl.render("sysauth", { duser = "root", fuser = user })
                        end
 
                        http.header("Set-Cookie", 'sysauth=%s; path=%s; HttpOnly%s' %{
                                sid, build_url(), http.getenv("HTTPS") == "on" and "; secure" or ""
                        })
+
                        http.redirect(build_url(unpack(ctx.requestpath)))
+                       return
                end
 
                if not sid or not sdat then
@@ -531,81 +815,117 @@ function dispatch(request)
                ctx.authuser = sdat.username
        end
 
-       if track.cors and http.getenv("REQUEST_METHOD") == "OPTIONS" then
+       local action = (page and type(page.action) == "table") and page.action or {}
+
+       if action.type == "arcombine" then
+               action = (#requested_path_args > 0) and action.targets[2] or action.targets[1]
+       end
+
+       if cors and http.getenv("REQUEST_METHOD") == "OPTIONS" then
                luci.http.status(200, "OK")
                luci.http.header("Access-Control-Allow-Origin", http.getenv("HTTP_ORIGIN") or "*")
                luci.http.header("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
                return
        end
 
-       if c and require_post_security(c.target, args) then
-               if not test_post_security(c) then
+       if require_post_security(action) then
+               if not test_post_security() then
                        return
                end
        end
 
-       if track.setgroup then
-               sys.process.setgroup(track.setgroup)
+       if sgid then
+               sys.process.setgroup(sgid)
        end
 
-       if track.setuser then
-               sys.process.setuser(track.setuser)
+       if suid then
+               sys.process.setuser(suid)
        end
 
-       local target = nil
-       if c then
-               if type(c.target) == "function" then
-                       target = c.target
-               elseif type(c.target) == "table" then
-                       target = c.target.target
+       if action.type == "view" then
+               tpl.render("view", { view = action.path })
+
+       elseif action.type == "call" then
+               local ok, mod = util.copcall(require, action.module)
+               if not ok then
+                       error500(mod)
+                       return
+               end
+
+               local func = mod[action["function"]]
+
+               assert(func ~= nil,
+                      'Cannot resolve function "' .. action["function"] .. '". Is it misspelled or local?')
+
+               assert(type(func) == "function",
+                      'The symbol "' .. action["function"] .. '" does not refer to a function but data ' ..
+                      'of type "' .. type(func) .. '".')
+
+               local argv = (type(action.parameters) == "table" and #action.parameters > 0) and { unpack(action.parameters) } or {}
+               for _, s in ipairs(requested_path_args) do
+                       argv[#argv + 1] = s
                end
-       end
 
-       if c and (c.index or type(target) == "function") then
-               ctx.dispatched = c
-               ctx.requested = ctx.requested or ctx.dispatched
-       end
+               local ok, err = util.copcall(func, unpack(argv))
+               if not ok then
+                       error500(err)
+               end
 
-       if c and c.index then
-               local tpl = require "luci.template"
+       elseif action.type == "firstchild" then
+               local sub_request = find_subnode(page, requested_path_full, action.recurse)
+               if sub_request then
+                       dispatch(sub_request)
+               else
+                       tpl.render("empty_node_placeholder", getfenv(1))
+               end
 
-               if util.copcall(tpl.render, "indexer", {}) then
-                       return true
+       elseif action.type == "alias" then
+               local sub_request = {}
+               for name in action.path:gmatch("[^/]+") do
+                       sub_request[#sub_request + 1] = name
                end
-       end
 
-       if type(target) == "function" then
-               util.copcall(function()
-                       local oldenv = getfenv(target)
-                       local module = require(c.module)
-                       local env = setmetatable({}, {__index=
+               for _, s in ipairs(requested_path_args) do
+                       sub_request[#sub_request + 1] = s
+               end
 
-                       function(tbl, key)
-                               return rawget(tbl, key) or module[key] or oldenv[key]
-                       end})
+               dispatch(sub_request)
 
-                       setfenv(target, env)
-               end)
+       elseif action.type == "rewrite" then
+               local sub_request = { unpack(request) }
+               for i = 1, action.remove do
+                       table.remove(sub_request, 1)
+               end
 
-               local ok, err
-               if type(c.target) == "table" then
-                       ok, err = util.copcall(target, c.target, unpack(args))
-               else
-                       ok, err = util.copcall(target, unpack(args))
+               local n = 1
+               for s in action.path:gmatch("[^/]+") do
+                       table.insert(sub_request, n, s)
+                       n = n + 1
                end
-               if not ok then
-                       error500("Failed to execute " .. (type(c.target) == "function" and "function" or c.target.type or "unknown") ..
-                                " dispatcher target for entry '/" .. table.concat(request, "/") .. "'.\n" ..
-                                "The called action terminated with an exception:\n" .. tostring(err or "(unknown)"))
+
+               for _, s in ipairs(requested_path_args) do
+                       sub_request[#sub_request + 1] = s
                end
+
+               dispatch(sub_request)
+
+       elseif action.type == "template" then
+               tpl.render(action.path, getfenv(1))
+
+       elseif action.type == "cbi" then
+               _cbi({ config = action.config, model = action.path }, unpack(requested_path_args))
+
+       elseif action.type == "form" then
+               _form({ model = action.path }, unpack(requested_path_args))
+
        else
-               local root = node()
-               if not root or not root.target then
+               local root = find_subnode(menu, {}, true)
+               if not root then
                        error404("No root node was registered, this usually happens if no module was installed.\n" ..
                                 "Install luci-mod-admin-full and retry. " ..
                                 "If the module is already installed, try removing the /tmp/luci-indexcache file.")
                else
-                       error404("No page is registered at '/" .. table.concat(request, "/") .. "'.\n" ..
+                       error404("No page is registered at '/" .. table.concat(requested_path_full, "/") .. "'.\n" ..
                                 "If this url belongs to an extension, make sure it is properly installed.\n" ..
                                 "If the extension was recently installed, try removing the /tmp/luci-indexcache file.")
                end
@@ -659,13 +979,9 @@ function createindex()
                       "' - It must correspond to the file path!")
 
                local idx = mod.index
-               assert(type(idx) == "function",
-                      "Invalid controller file found\n" ..
-                      "The file '" .. path .. "' contains no index() function.\n" ..
-                      "Please make sure that the controller contains a valid " ..
-                      "index function and verify the spelling!")
-
-               index[modname] = idx
+               if type(idx) == "function" then
+                       index[modname] = idx
+               end
        end
 
        if indexcache then
@@ -675,6 +991,94 @@ function createindex()
        end
 end
 
+function createtree_json()
+       local json = require "luci.jsonc"
+       local tree = {}
+
+       local schema = {
+               action = "table",
+               auth = "table",
+               cors = "boolean",
+               depends = "table",
+               order = "number",
+               setgroup = "string",
+               setuser = "string",
+               title = "string",
+               wildcard = "boolean"
+       }
+
+       local files = {}
+       local fprint = {}
+       local cachefile
+
+       for file in (fs.glob("/usr/share/luci/menu.d/*.json") or function() end) do
+               files[#files+1] = file
+
+               if indexcache then
+                       local st = fs.stat(file)
+                       if st then
+                               fprint[#fprint+1] = '%x' % st.ino
+                               fprint[#fprint+1] = '%x' % st.mtime
+                               fprint[#fprint+1] = '%x' % st.size
+                       end
+               end
+       end
+
+       if indexcache then
+               cachefile = "%s.%s.json" %{
+                       indexcache,
+                       nixio.crypt(table.concat(fprint, "|"), "$1$"):sub(5):gsub("/", ".")
+               }
+
+               local res = json.parse(fs.readfile(cachefile) or "")
+               if res then
+                       return res
+               end
+
+               for file in (fs.glob("%s.*.json" % indexcache) or function() end) do
+                       fs.unlink(file)
+               end
+       end
+
+       for _, file in ipairs(files) do
+               local data = json.parse(fs.readfile(file) or "")
+               if type(data) == "table" then
+                       for path, spec in pairs(data) do
+                               if type(spec) == "table" then
+                                       local node = tree
+
+                                       for s in path:gmatch("[^/]+") do
+                                               if s == "*" then
+                                                       node.wildcard = true
+                                                       break
+                                               end
+
+                                               node.children = node.children or {}
+                                               node.children[s] = node.children[s] or {}
+                                               node = node.children[s]
+                                       end
+
+                                       if node ~= tree then
+                                               for k, t in pairs(schema) do
+                                                       if type(spec[k]) == t then
+                                                               node[k] = spec[k]
+                                                       end
+                                               end
+
+                                               node.satisfied = check_depends(spec)
+                                       end
+                               end
+                       end
+               end
+       end
+
+       if cachefile then
+               fs.writefile(cachefile, json.stringify(tree))
+       end
+
+       return tree
+end
+
 -- Build the index before if it does not exist yet.
 function createtree()
        if not index then
@@ -767,16 +1171,6 @@ function _create_node(path)
 
                c = {nodes={}, auto=true, inreq=true}
 
-               local _, n
-               for _, n in ipairs(path) do
-                       if context.path[_] ~= n then
-                               c.inreq = false
-                               break
-                       end
-               end
-
-               c.inreq = c.inreq and (context.path[#path + 1] == last)
-
                parent.nodes[last] = c
                context.treecache[name] = c
        end
@@ -786,119 +1180,24 @@ end
 
 -- Subdispatchers --
 
-function _find_eligible_node(root, prefix, deep, types, descend)
-       local children = _ordered_children(root)
-
-       if not root.leaf and deep ~= nil then
-               local sub_path = { unpack(prefix) }
-
-               if deep == false then
-                       deep = nil
-               end
-
-               local _, child
-               for _, child in ipairs(children) do
-                       sub_path[#prefix+1] = child.name
-
-                       local res_path = _find_eligible_node(child.node, sub_path,
-                                                            deep, types, true)
-
-                       if res_path then
-                               return res_path
-                       end
-               end
-       end
-
-       if descend and
-          (not types or
-           (type(root.target) == "table" and
-            util.contains(types, root.target.type)))
-       then
-               return prefix
-       end
-end
-
-function _find_node(recurse, types)
-       local path = { unpack(context.path) }
-       local name = table.concat(path, ".")
-       local node = context.treecache[name]
-
-       path = _find_eligible_node(node, path, recurse, types)
-
-       if path then
-               dispatch(path)
-       else
-               require "luci.template".render("empty_node_placeholder")
-       end
-end
-
-function _firstchild()
-       return _find_node(false, nil)
-end
-
 function firstchild()
-       return { type = "firstchild", target = _firstchild }
-end
-
-function _firstnode()
-       return _find_node(true, { "cbi", "form", "template", "arcombine" })
+       return { type = "firstchild" }
 end
 
 function firstnode()
-       return { type = "firstnode", target = _firstnode }
+       return { type = "firstnode" }
 end
 
 function alias(...)
-       local req = {...}
-       return function(...)
-               for _, r in ipairs({...}) do
-                       req[#req+1] = r
-               end
-
-               dispatch(req)
-       end
+       return { type = "alias", req = { ... } }
 end
 
 function rewrite(n, ...)
-       local req = {...}
-       return function(...)
-               local dispatched = util.clone(context.dispatched)
-
-               for i=1,n do
-                       table.remove(dispatched, 1)
-               end
-
-               for i, r in ipairs(req) do
-                       table.insert(dispatched, i, r)
-               end
-
-               for _, r in ipairs({...}) do
-                       dispatched[#dispatched+1] = r
-               end
-
-               dispatch(dispatched)
-       end
-end
-
-
-local function _call(self, ...)
-       local func = getfenv()[self.name]
-       assert(func ~= nil,
-              'Cannot resolve function "' .. self.name .. '". Is it misspelled or local?')
-
-       assert(type(func) == "function",
-              'The symbol "' .. self.name .. '" does not refer to a function but data ' ..
-              'of type "' .. type(func) .. '".')
-
-       if #self.argv > 0 then
-               return func(unpack(self.argv), ...)
-       else
-               return func(...)
-       end
+       return { type = "rewrite", n = n, req = { ... } }
 end
 
 function call(name, ...)
-       return {type = "call", argv = {...}, name = name, target = _call}
+       return { type = "call", argv = {...}, name = name }
 end
 
 function post_on(params, name, ...)
@@ -906,8 +1205,7 @@ function post_on(params, name, ...)
                type = "call",
                post = params,
                argv = { ... },
-               name = name,
-               target = _call
+               name = name
        }
 end
 
@@ -916,25 +1214,16 @@ function post(...)
 end
 
 
-local _template = function(self, ...)
-       require "luci.template".render(self.view)
-end
-
 function template(name)
-       return {type = "template", view = name, target = _template}
-end
-
-
-local _view = function(self, ...)
-       require "luci.template".render("view", { view = self.view })
+       return { type = "template", view = name }
 end
 
 function view(name)
-       return {type = "view", view = name, target = _view}
+       return { type = "view", view = name }
 end
 
 
-local function _cbi(self, ...)
+function _cbi(self, ...)
        local cbi = require "luci.cbi"
        local tpl = require "luci.template"
        local http = require "luci.http"
@@ -1048,25 +1337,21 @@ function cbi(model, config)
                type = "cbi",
                post = { ["cbi.submit"] = true },
                config = config,
-               model = model,
-               target = _cbi
+               model = model
        }
 end
 
 
-local function _arcombine(self, ...)
-       local argv = {...}
-       local target = #argv > 0 and self.targets[2] or self.targets[1]
-       setfenv(target.target, self.env)
-       target:target(unpack(argv))
-end
-
 function arcombine(trg1, trg2)
-       return {type = "arcombine", env = getfenv(), target = _arcombine, targets = {trg1, trg2}}
+       return {
+               type = "arcombine",
+               env = getfenv(),
+               targets = {trg1, trg2}
+       }
 end
 
 
-local function _form(self, ...)
+function _form(self, ...)
        local cbi = require "luci.cbi"
        local tpl = require "luci.template"
        local http = require "luci.http"
@@ -1092,10 +1377,9 @@ end
 
 function form(model)
        return {
-               type = "cbi",
+               type = "form",
                post = { ["cbi.submit"] = true },
-               model = model,
-               target = _form
+               model = model
        }
 end
 

diff --git a/modules/luci-base/luasrc/tools/proto.lua b/modules/luci-base/luasrc/tools/proto.lua
deleted file mode 100644 (file)
index 147688d..0000000
--- a/modules/luci-base/luasrc/tools/proto.lua
+++ /dev/null
@@ -1,36 +0,0 @@
--- Copyright 2012 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-module("luci.tools.proto", package.seeall)
-
-function opt_macaddr(s, ifc, ...)
-       local v = luci.cbi.Value
-       local o = s:taboption("advanced", v, "macaddr", ...)
-
-       o.placeholder = ifc and ifc:mac()
-       o.datatype    = "macaddr"
-
-       function o.cfgvalue(self, section)
-               local w = ifc and ifc:get_wifinet()
-               if w then
-                       return w:get("macaddr")
-               else
-                       return v.cfgvalue(self, section)
-               end
-       end
-
-       function o.write(self, section, value)
-               local w = ifc and ifc:get_wifinet()
-               if w then
-                       w:set("macaddr", value)
-               elseif value then
-                       v.write(self, section, value)
-               else
-                       v.remove(self, section)
-               end
-       end
-
-       function o.remove(self, section)
-               self:write(section, nil)
-       end
-end

diff --git a/modules/luci-base/luasrc/tools/webadmin.lua b/modules/luci-base/luasrc/tools/webadmin.lua
deleted file mode 100644 (file)
index 106810a..0000000
--- a/modules/luci-base/luasrc/tools/webadmin.lua
+++ /dev/null
@@ -1,105 +0,0 @@
--- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-module("luci.tools.webadmin", package.seeall)
-
-local util = require "luci.util"
-local uci  = require "luci.model.uci"
-local ip   = require "luci.ip"
-
-function byte_format(byte)
-       local suff = {"B", "KB", "MB", "GB", "TB"}
-       for i=1, 5 do
-               if byte > 1024 and i < 5 then
-                       byte = byte / 1024
-               else
-                       return string.format("%.2f %s", byte, suff[i]) 
-               end 
-       end
-end
-
-function date_format(secs)
-       local suff = {"min", "h", "d"}
-       local mins = 0
-       local hour = 0
-       local days = 0
-       
-       secs = math.floor(secs)
-       if secs > 60 then
-               mins = math.floor(secs / 60)
-               secs = secs % 60
-       end
-       
-       if mins > 60 then
-               hour = math.floor(mins / 60)
-               mins = mins % 60
-       end
-       
-       if hour > 24 then
-               days = math.floor(hour / 24)
-               hour = hour % 24
-       end
-       
-       if days > 0 then
-               return string.format("%.0fd %02.0fh %02.0fmin %02.0fs", days, hour, mins, secs)
-       else
-               return string.format("%02.0fh %02.0fmin %02.0fs", hour, mins, secs)
-       end
-end
-
-function cbi_add_networks(field)
-       uci.cursor():foreach("network", "interface",
-               function (section)
-                       if section[".name"] ~= "loopback" then
-                               field:value(section[".name"])
-                       end
-               end
-       )
-       field.titleref = luci.dispatcher.build_url("admin", "network", "network")
-end
-
-function cbi_add_knownips(field)
-       local _, n
-       for _, n in ipairs(ip.neighbors({ family = 4 })) do
-               if n.dest then
-                       field:value(n.dest:string())
-               end
-       end
-end
-
-function firewall_find_zone(name)
-       local find
-       
-       luci.model.uci.cursor():foreach("firewall", "zone", 
-               function (section)
-                       if section.name == name then
-                               find = section[".name"]
-                       end
-               end
-       )
-       
-       return find
-end
-
-function iface_get_network(iface)
-       local link = ip.link(tostring(iface))
-       if link.master then
-               iface = link.master
-       end
-
-       local cur = uci.cursor()
-       local dump = util.ubus("network.interface", "dump", { })
-       if dump then
-               local _, net
-               for _, net in ipairs(dump.interface) do
-                       if net.l3_device == iface or net.device == iface then
-                               -- cross check with uci to filter out @name style aliases
-                               local uciname = cur:get("network", net.interface, "ifname")
-                               if type(uciname) == "string" and uciname:sub(1,1) ~= "@" or uciname then
-                                       return net.interface
-                               end
-                       end
-               end
-       end
-end

diff --git a/modules/luci-base/luasrc/view/header.htm b/modules/luci-base/luasrc/view/header.htm
index 1ef0e5b01300359593a4daaa46b55ada974f6ce7..9cdedde5c2bc08bfbbf1a922c7e60e6193409c4b 100644 (file)
--- a/modules/luci-base/luasrc/view/header.htm
+++ b/modules/luci-base/luasrc/view/header.htm
@@ -13,8 +13,8 @@
        local applyconf = luci.config and luci.config.apply
 %>
 
-<script type="text/javascript" src="<%=resource%>/promis.min.js"></script>
-<script type="text/javascript" src="<%=resource%>/luci.js"></script>
+<script type="text/javascript" src="<%=resource%>/promis.min.js?v=git-19.292.31773-cc35194"></script>
+<script type="text/javascript" src="<%=resource%>/luci.js?v=git-19.292.31773-cc35206"></script>
 <script type="text/javascript">
        L = new LuCI(<%= luci.http.write_json({
                token          = token,
@@ -22,6 +22,7 @@
                scriptname     = luci.http.getenv("SCRIPT_NAME"),
                pathinfo       = luci.http.getenv("PATH_INFO"),
                requestpath    = luci.dispatcher.context.requestpath,
+               dispatchpath   = luci.dispatcher.context.path,
                pollinterval   = luci.config.main.pollinterval or 5,
                sessionid      = luci.dispatcher.context.authsession,
                apply_rollback = math.max(applyconf and applyconf.rollback or 30, 30),

diff --git a/modules/luci-base/po/bg/base.po b/modules/luci-base/po/bg/base.po
index bc7b99b4d4dbfc67b32a64cb8c762760b7930b1d..c6c81945e37da225ac4e0995a214782a3829bd4c 100644 (file)
--- a/modules/luci-base/po/bg/base.po
+++ b/modules/luci-base/po/bg/base.po
@@ -139,15 +139,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 +157,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,7 +182,7 @@ 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 ""
 
@@ -195,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 ""
 
@@ -332,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 ""
@@ -387,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 ""
 
@@ -400,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 ""
 
@@ -425,12 +426,12 @@ 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
 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
@@ -442,7 +443,7 @@ msgid "Advanced Settings"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -459,17 +460,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 +494,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 +510,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 +681,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 +689,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,10 +795,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 +812,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 +832,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 +1018,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 +1051,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 +1090,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 +1183,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 +1219,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 +1227,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 +1260,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 +1399,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 +1456,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 +1490,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 +1498,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 +1526,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 +1538,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 +1679,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,19 +1799,26 @@ 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 ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1895,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 +1904,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 +1931,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 +1955,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 +2083,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 +2122,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 +2175,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 +2199,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 +2212,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 ""
 
@@ -2237,7 +2242,7 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2245,13 +2250,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 +2324,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 +2336,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 +2405,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 +2497,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 +2505,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 +2557,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 +2618,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 +2673,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 +2696,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 +2773,20 @@ 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:36
+msgid "Lease time remaining"
+msgstr ""
+
+#: 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 +2813,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 +2841,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 +2869,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 +2889,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 +2902,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 +2934,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 +2947,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 +2979,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 +2991,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 +3088,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 ""
 
@@ -3325,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
@@ -3337,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 ""
 
@@ -3402,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,10 +3453,10 @@ msgid "Noise:"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +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 ""
 
@@ -3547,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 ""
 
@@ -3722,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 ""
 
@@ -3950,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 ""
 
@@ -3997,7 +4000,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4027,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 ""
 
@@ -4040,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 ""
 
@@ -4097,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"
@@ -4164,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"
@@ -4174,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 ""
 
@@ -4182,7 +4185,7 @@ 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 ""
 
@@ -4315,7 +4318,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 +4364,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 +4420,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 ""
 
@@ -4447,8 +4450,8 @@ 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 ""
 
@@ -4584,7 +4587,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 +4600,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 +4691,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 +4704,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 ""
 
@@ -4817,11 +4820,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 +4834,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 +4845,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 +4858,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 +4871,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 +4884,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 +4932,15 @@ 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
 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 +4956,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 +5178,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 +5189,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 +5210,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 +5243,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 +5311,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 +5547,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 +5658,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 +5707,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 +5785,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 +5819,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 +5869,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 +5895,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 +5919,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 +6008,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 +6067,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 +6104,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 +6191,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 +6221,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 +6234,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 +6263,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 +6323,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 +6351,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 9bf0b657f39c929b21a75dd6933b9987e5d3a938..1e9091b4b635082c7e362f0e61eca61410b97324 100644 (file)
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -149,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 "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 +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 "Adreça <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -196,7 +196,7 @@ 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 ""
 
@@ -209,16 +209,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 +226,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 +234,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 +355,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 +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 ""
 "Afegeix el sufix de domini local als noms servits des dels fitxers de hosts"
@@ -424,11 +425,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 +450,12 @@ 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
 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
@@ -466,7 +467,7 @@ msgid "Advanced Settings"
 msgstr "Paràmetres avançats"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -483,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 ""
 
@@ -519,7 +520,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 +538,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 +709,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 +717,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"
@@ -822,10 +823,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 +843,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 +863,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 +1057,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 +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 "Configuració"
@@ -1132,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 "Connexions"
 
@@ -1227,8 +1224,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 +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 "Reenviaments DNS"
 
@@ -1271,11 +1268,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 +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"
@@ -1442,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 "Diagnòstics"
 
@@ -1502,7 +1499,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 +1533,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 +1545,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 +1573,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 +1585,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 +1731,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,19 +1851,26 @@ 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 ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1947,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 +1956,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 +1983,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 +2007,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 +2135,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 +2176,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 +2232,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 +2256,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 +2269,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"
 
@@ -2294,7 +2299,7 @@ msgstr "Adreça IP"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2302,13 +2307,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 +2381,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 +2393,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 +2462,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 +2560,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 +2568,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 +2620,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 +2681,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 +2739,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 +2762,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,20 +2839,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Temps d'arrendament restant"
+
+#: 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"
-msgstr "Temps d'arrendament restant"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2873,11 +2879,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 +2907,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 +2935,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 +2957,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 +2970,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 +3002,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 +3015,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 +3047,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 +3059,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 +3156,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 ""
 
@@ -3395,11 +3397,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 +3408,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 +3474,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!"
@@ -3521,10 +3523,10 @@ msgid "Noise:"
 msgstr "Soroll:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3568,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 +3619,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 +3794,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 +4022,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 ""
 
@@ -4067,7 +4070,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4097,7 +4100,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 +4113,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 +4170,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 +4237,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 +4249,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,7 +4257,7 @@ 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 ""
 
@@ -4387,7 +4390,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 +4436,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 +4492,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"
 
@@ -4519,8 +4522,8 @@ 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"
 
@@ -4658,7 +4661,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 +4674,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 +4765,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 +4778,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ó"
 
@@ -4891,11 +4894,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 +4908,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 +4919,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 +4932,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 +4945,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 +4958,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 +5006,15 @@ 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
 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 +5030,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 +5267,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 +5278,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 +5301,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 +5337,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 +5415,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 +5651,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 +5762,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 +5811,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 +5891,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 +5925,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 +5975,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 +6005,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 +6031,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 +6121,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 +6182,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 +6219,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 +6306,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 +6336,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 +6349,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 +6378,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 +6438,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 +6466,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 +6514,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 398db427d5eb991d35cf70ce19b4568e6cb4d275..c3e4501eb1033125f1b7be890476e3eea8b102d5 100644 (file)
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -146,15 +146,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 +166,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 +192,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 "
@@ -207,16 +207,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 +224,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 +357,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 +413,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 +426,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 +451,12 @@ 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
 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
@@ -467,7 +468,7 @@ msgid "Advanced Settings"
 msgstr "Pokročilé nastavení"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr "Celkový vysílací výkon (ACTATP)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -484,17 +485,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 +521,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 +539,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 +679,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 +702,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 +720,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 +728,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"
@@ -833,10 +836,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 +856,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 +876,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 +1076,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 +1114,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 +1153,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 +1253,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 +1289,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 +1297,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 +1330,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 +1471,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 +1530,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 +1564,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 +1576,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 +1606,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 +1618,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 +1770,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,19 +1892,26 @@ 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"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1993,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 +2002,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 +2031,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 +2055,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 +2186,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 +2225,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 +2280,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 +2305,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 +2318,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ů"
 
@@ -2341,7 +2348,7 @@ msgstr "IP adresy"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr "Neplatná IP adresa"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2349,13 +2356,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 +2430,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 +2442,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 +2511,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 +2609,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 +2617,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 +2671,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 +2732,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 +2791,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 +2814,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,20 +2891,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Zbývající doba trvání zápůjčky"
+
+#: 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"
-msgstr "Zbývající doba trvání zápůjčky"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2923,13 +2931,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 +2961,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 +3005,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 +3026,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 +3039,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 +3071,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 +3084,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 +3097,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 +3114,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 +3122,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 +3134,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 +3234,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ů"
 
@@ -3472,11 +3476,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 +3487,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 +3553,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!"
@@ -3598,10 +3602,10 @@ msgid "Noise:"
 msgstr "Šum:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3647,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 +3699,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 +3764,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 +3890,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 +4118,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"
 
@@ -4161,7 +4166,7 @@ msgid "Power Management Mode"
 msgstr "Režim řízení spotřeby"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr "Preemptivní chyby CRC (CRCP_P)"
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4193,7 +4198,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 +4211,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 +4272,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 +4343,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 +4355,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,7 +4363,7 @@ 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"
 
@@ -4498,7 +4503,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 +4551,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 +4607,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"
 
@@ -4632,8 +4637,8 @@ 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"
 
@@ -4775,7 +4780,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 +4793,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 +4886,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 +4899,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"
 
@@ -5022,11 +5027,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 +5041,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 +5055,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 +5068,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 +5081,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 +5094,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 +5145,15 @@ 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
 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 +5169,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 +5283,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 +5430,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 +5441,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 +5464,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 +5511,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 +5540,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 +5592,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 +5833,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 +5944,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 +6001,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 +6081,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 +6118,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 +6168,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 +6199,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 +6224,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 +6313,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 +6374,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 +6411,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 +6498,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 +6528,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 +6541,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 +6570,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 +6630,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 +6658,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 +6706,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 755a52e7f4fe93b12451c15147707a205759969c..ad32efbce7aa9daa48489690f9dc0254e10485fb 100644 (file)
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -150,15 +150,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 +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>-Addresse"
@@ -197,7 +197,7 @@ 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)"
@@ -211,18 +211,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 +230,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 +238,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 +360,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 +416,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 +429,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 +454,12 @@ 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
 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
@@ -470,7 +471,7 @@ msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr "Vollständige Sendeleistung (ACTATP)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -487,11 +488,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 +500,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 +527,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 +545,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 +730,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 +738,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"
@@ -843,10 +844,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 +865,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 +887,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 +1089,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 +1126,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 +1165,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 +1248,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 +1267,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 +1303,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 +1311,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 +1344,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 +1485,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 +1544,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 +1579,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 +1591,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 +1624,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 +1636,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 +1674,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 +1789,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,19 +1911,26 @@ 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"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +2011,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 +2020,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 +2049,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 +2073,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 +2205,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 +2246,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 +2294,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 +2326,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 +2339,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"
 
@@ -2363,7 +2369,7 @@ msgstr "IP-Adresse"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr "IP-Adresse ist ungültig"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2371,13 +2377,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 +2451,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 +2463,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 +2532,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 +2632,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 +2640,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 +2695,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 +2757,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 +2815,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 +2838,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,20 +2915,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Verbleibende Gültigkeit"
+
+#: 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"
-msgstr "Verbleibende Gültigkeit"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2950,13 +2955,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 +2985,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 +3027,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 +3049,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 +3062,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 +3094,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 +3107,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 +3120,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 +3138,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 +3146,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 +3158,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 +3255,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"
 
@@ -3495,11 +3496,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 +3507,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 +3573,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!"
@@ -3621,10 +3622,10 @@ msgid "Noise:"
 msgstr "Rauschen:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3667,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 +3720,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 +3911,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 +4139,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"
 
@@ -4185,7 +4187,7 @@ msgid "Power Management Mode"
 msgstr "Energiesparmodus"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr "Präemptive CRC-Fehler (CRCP_P)"
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4217,7 +4219,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 +4232,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 +4297,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 +4369,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 +4381,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,7 +4389,7 @@ 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"
 
@@ -4527,7 +4529,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 +4577,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 +4633,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"
 
@@ -4661,8 +4663,8 @@ 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"
 
@@ -4805,7 +4807,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 +4820,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 +4914,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 +4927,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"
 
@@ -5056,11 +5058,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 +5072,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 +5087,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 +5100,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 +5113,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 +5127,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 +5177,15 @@ 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
 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 +5201,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 +5305,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 +5386,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 +5480,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 +5491,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 +5516,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 +5563,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 +5644,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 +5886,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 +5997,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 +6054,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 +6134,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 +6173,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 +6223,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 +6255,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 +6281,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 +6370,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 +6431,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 +6468,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 +6555,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 +6585,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 +6598,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 +6627,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 +6687,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 +6715,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 +6763,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 1f266cdfbd3eed617c00b24e5f39d2a7d40bd805..bc942860e70881afa1f18f3a3afe5ed1c6d211fa 100644 (file)
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -148,15 +148,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 +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 Protocol Version 4\">IPv4</abbr>"
@@ -195,7 +195,7 @@ 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 ""
 
@@ -208,16 +208,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 +225,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 +233,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 +354,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 +410,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 +424,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 +449,12 @@ 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
 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,7 +466,7 @@ msgid "Advanced Settings"
 msgstr "Προχωρημένες Ρυθμίσεις"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -482,17 +483,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 +519,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 +538,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 +711,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 +719,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"
@@ -824,11 +825,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 +846,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 +866,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 +1061,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 +1094,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 +1133,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 +1228,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 +1264,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 +1272,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 +1305,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 +1446,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 +1505,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 +1539,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 +1551,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 +1583,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 +1595,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 +1744,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,19 +1864,26 @@ 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 ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1963,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 +1972,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 +1999,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 +2023,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 +2153,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 +2192,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 +2247,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 +2272,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 +2285,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 "Ονόματα Υπολογιστών"
 
@@ -2311,7 +2315,7 @@ msgstr "Διεύθυνση IP"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2319,13 +2323,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 +2397,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 +2409,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 +2478,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 +2580,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 +2588,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 +2640,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 +2701,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 +2759,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 +2782,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,20 +2859,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Υπόλοιπο χρόνου Lease"
+
+#: 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"
-msgstr "Υπόλοιπο χρόνου Lease"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2894,11 +2899,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 +2927,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 +2955,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 +2975,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 +2988,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 +3020,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 +3033,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 +3065,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 +3077,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 +3174,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 πακέτων"
 
@@ -3415,11 +3416,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 +3427,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 +3493,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 "Δεν έχει οριστεί κωδικός πρόσβασης!"
@@ -3541,10 +3542,10 @@ msgid "Noise:"
 msgstr "Θόρυβος:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3587,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 +3638,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 +3813,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 +4041,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 ""
 
@@ -4087,7 +4089,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4117,7 +4119,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 +4133,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 +4190,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 +4257,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 +4269,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,7 +4277,7 @@ 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 ""
 
@@ -4408,7 +4410,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 +4456,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 +4512,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"
 
@@ -4540,8 +4542,8 @@ 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 "Διαδρομές"
@@ -4680,7 +4682,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 +4695,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 +4786,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 +4799,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 "Παράκαμψη σε πλοήγηση"
 
@@ -4913,11 +4915,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 +4929,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 +4940,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 +4953,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 +4966,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 +4979,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 +5027,15 @@ 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
 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 +5051,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 +5284,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 +5295,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 +5316,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 +5349,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 +5427,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 +5663,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 +5774,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 +5823,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 +5901,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 +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 "Ασύρματο"
 
@@ -5985,7 +5985,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 +6015,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 +6039,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 +6130,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 +6191,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 +6228,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 +6315,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 +6345,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 +6358,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 +6387,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 +6447,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 +6475,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 +6523,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 4ba87b6320914997100856f18fefbfbe86d5d08c..12abaab671390138eb0f58047ad94c03779c975d 100644 (file)
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -148,15 +148,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 +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 Protocol Version 4\">IPv4</abbr>-Address"
@@ -195,7 +195,7 @@ 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 ""
 
@@ -208,16 +208,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 +225,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 +233,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 +352,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 +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 "Add local domain suffix to names served from hosts files"
 
@@ -420,11 +421,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 +446,12 @@ 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
 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
@@ -462,7 +463,7 @@ msgid "Advanced Settings"
 msgstr "Advanced Settings"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -479,17 +480,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 +514,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 +530,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 +702,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 +710,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"
@@ -815,10 +816,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 +836,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 +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"
 
@@ -1053,10 +1050,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 +1083,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 +1122,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 +1217,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 +1253,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 +1261,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 +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 ""
@@ -1438,8 +1436,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 +1493,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 +1527,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 +1539,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 +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 "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 +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"
@@ -1728,7 +1725,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,19 +1845,26 @@ 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 ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1941,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 +1950,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 +1977,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 +2001,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 +2129,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 +2168,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 +2223,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 +2247,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 +2260,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"
 
@@ -2285,7 +2290,7 @@ msgstr "IP address"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2293,13 +2298,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 +2372,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 +2384,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 +2453,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 +2550,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 +2558,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 +2610,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 +2671,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 +2729,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 +2752,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,20 +2829,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Lease time remaining"
+
+#: 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"
-msgstr "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2863,11 +2869,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 +2897,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 +2925,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 +2945,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 +2958,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 +2990,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 +3003,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 +3035,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 +3047,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 +3144,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 ""
 
@@ -3383,11 +3385,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 +3396,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 +3462,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 ""
@@ -3509,10 +3511,10 @@ msgid "Noise:"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3556,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 +3607,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 +3782,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 +4010,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 ""
 
@@ -4055,7 +4058,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4085,7 +4088,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 +4101,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 +4158,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 +4225,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 +4237,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,7 +4245,7 @@ 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 ""
 
@@ -4375,7 +4378,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 +4424,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 +4480,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 ""
 
@@ -4507,8 +4510,8 @@ 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"
 
@@ -4646,7 +4649,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 +4662,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 +4753,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 +4766,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"
 
@@ -4879,11 +4882,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 +4896,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 +4907,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 +4920,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 +4933,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 +4946,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 +4994,15 @@ 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
 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 +5018,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 +5249,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 +5260,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 +5281,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 +5314,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 +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 "Traffic"
 
@@ -5620,7 +5625,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 +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 "
@@ -5780,7 +5785,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 +5865,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 +5899,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 +5949,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 +5978,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 +6002,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 +6091,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 +6152,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 +6189,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 +6276,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 +6306,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 +6319,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 +6348,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 +6408,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 +6436,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 +6484,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 e866ee00a1d9b70d65aa30f294aef9a8a2d7f1bc..cb5c6a75d44b5ed4a72b7e60c35be61c82b8c104 100644 (file)
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -151,15 +151,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 +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 "Dirección <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -199,7 +199,7 @@ 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>-"
 
@@ -212,16 +212,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 +229,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 +237,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 +360,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 +416,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 +431,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 +456,12 @@ 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
 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
@@ -472,7 +473,7 @@ msgid "Advanced Settings"
 msgstr "Configuración avanzada"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr "Potencia de transmisión agregada (ACTATP)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -489,11 +490,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 +502,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 +529,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 +547,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 +729,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 +737,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"
@@ -844,10 +845,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 +866,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 +888,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 +1087,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 +1125,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 +1164,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 +1265,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 +1301,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 +1309,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 +1342,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 +1484,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 +1543,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 +1577,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 +1589,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 +1619,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 +1631,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 +1783,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,19 +1906,26 @@ 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"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +2006,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 +2015,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 +2045,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 +2069,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 +2199,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 +2240,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 +2295,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 +2319,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 +2332,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"
 
@@ -2357,7 +2362,7 @@ msgstr "Dirección IP"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr "Dirección IP inválida"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2365,13 +2370,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 +2444,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 +2456,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 +2525,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 +2628,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 +2636,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 +2691,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 +2752,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 +2809,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 +2832,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,20 +2909,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Tiempo de conexión restante"
+
+#: 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"
-msgstr "Tiempo de conexión restante"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2943,13 +2949,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 +2979,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 +3020,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 +3040,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 +3053,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 +3085,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 +3098,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 +3110,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 +3128,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 +3136,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 +3148,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 +3247,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"
 
@@ -3486,11 +3488,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 +3499,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 +3565,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!"
@@ -3612,10 +3614,10 @@ msgid "Noise:"
 msgstr "Ruido:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3659,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 +3712,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 +3902,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 +4130,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"
 
@@ -4175,7 +4178,7 @@ msgid "Power Management Mode"
 msgstr "Modo de administración de energía"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr "Errores preventivos de CRC (CRC P)"
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4207,7 +4210,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 +4223,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 +4287,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 +4358,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 +4370,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,7 +4378,7 @@ 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"
 
@@ -4513,7 +4516,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 +4564,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 +4620,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"
 
@@ -4647,8 +4650,8 @@ 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"
 
@@ -4791,7 +4794,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 +4807,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 +4901,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 +4914,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"
 
@@ -5041,11 +5044,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 +5058,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 +5073,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 +5086,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 +5099,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 +5112,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 +5162,15 @@ 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
 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 +5186,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 +5455,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 +5466,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 +5489,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 +5535,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 +5613,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 +5854,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 +5965,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 +6020,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 +6100,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 +6137,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 +6187,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 +6219,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 +6244,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 +6333,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 +6394,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 +6431,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 +6518,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 +6548,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 +6561,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 +6590,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 +6650,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 +6678,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 +6726,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 0637190afc4ce4a8f7020d6f4290c3dfb5f32416..899714de13fd77eee6216e68b0c8ef9705590b35 100644 (file)
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -149,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 "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 +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 "Adresse <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -196,7 +196,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 "
@@ -212,16 +212,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 +229,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 +237,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 +363,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 +419,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 +433,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 +458,12 @@ 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
 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
@@ -474,7 +475,7 @@ msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -491,17 +492,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 +528,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 +547,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 +720,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 +728,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"
@@ -833,10 +834,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 +854,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 +874,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 +1071,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 +1104,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 +1143,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 +1238,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 +1274,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 +1282,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 +1315,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 +1457,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 +1516,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 +1550,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 +1562,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 +1595,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 +1607,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 +1757,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,19 +1879,26 @@ 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"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1977,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 +1986,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 +2013,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 +2037,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 +2165,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 +2206,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 +2261,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 +2285,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 +2298,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"
 
@@ -2323,7 +2328,7 @@ msgstr "Adresse IP"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2331,13 +2336,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 +2410,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 +2422,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 +2491,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 +2591,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 +2599,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 +2651,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 +2712,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 +2772,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 +2795,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,20 +2872,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Durée de validité"
+
+#: 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"
-msgstr "Durée de validité"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2906,11 +2912,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 +2940,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 +2970,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 +2991,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 +3004,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 +3036,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 +3049,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 +3062,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 +3079,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 +3087,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 +3099,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 +3198,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"
 
@@ -3437,11 +3439,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 +3450,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 +3516,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é !"
@@ -3563,10 +3565,10 @@ msgid "Noise:"
 msgstr "Bruit :"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3610,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 +3661,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 +3838,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 +4066,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"
 
@@ -4111,7 +4114,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4143,7 +4146,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 +4159,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 +4216,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 +4283,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 +4293,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,7 +4301,7 @@ 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 »"
 
@@ -4431,7 +4434,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 +4480,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 +4536,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"
 
@@ -4563,8 +4566,8 @@ 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"
 
@@ -4705,7 +4708,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 +4721,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 +4812,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 +4825,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"
 
@@ -4944,11 +4947,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 +4961,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 +4976,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 +4989,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 +5002,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 +5015,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 +5063,15 @@ 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
 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 +5087,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 +5337,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 +5348,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 +5372,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 +5413,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 +5492,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 +5728,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 +5839,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 +5892,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 +5972,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 +6008,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 +6058,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 +6088,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 +6114,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 +6203,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 +6262,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 +6299,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 +6386,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 +6416,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 +6429,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 +6458,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 +6518,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 +6546,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 +6594,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 db33139c85de9d879183859e221780c60a97b5b5..836106e8ca08f21a456c1a0068f0748620880eb6 100644 (file)
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -146,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 "<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 +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 "כתובות <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -190,7 +190,7 @@ 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 ""
 
@@ -203,28 +203,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 +345,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 +403,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 +417,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 +442,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
 #, 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
@@ -459,7 +460,7 @@ msgid "Advanced Settings"
 msgstr "הגדרות מתקדמות"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -477,17 +478,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 +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
 #, fuzzy
 msgid "Allow localhost"
 msgstr "אפשר localhost"
@@ -529,7 +530,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 +703,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 +711,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,10 +817,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 +837,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 +857,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 +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 "אוסף מידע..."
 
@@ -1079,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 "הגדרות"
@@ -1119,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 "חיבורים"
 
@@ -1214,8 +1211,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 +1247,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 +1255,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 +1288,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 +1429,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 +1486,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 +1520,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 +1528,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 +1556,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 +1568,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 +1711,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,19 +1831,26 @@ 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 ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1927,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 +1936,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 +1963,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 +1987,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 +2115,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 +2154,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 +2207,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 +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
@@ -2239,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 ""
 
@@ -2269,7 +2274,7 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2277,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 ""
@@ -2351,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
@@ -2361,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 ""
@@ -2432,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"
@@ -2523,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 ""
 
@@ -2531,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 ""
 
@@ -2583,10 +2589,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 +2650,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 +2705,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 +2728,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 +2805,20 @@ 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:36
+msgid "Lease time remaining"
+msgstr ""
+
+#: 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 +2845,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 +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"
@@ -2895,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 ""
 
@@ -2915,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 "עומס"
 
@@ -2928,10 +2934,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 +2966,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 +2979,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 +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 ""
 
@@ -3021,7 +3023,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 +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 ""
 
-#: 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 ""
 
@@ -3357,11 +3359,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 +3370,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 +3436,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 "לא הוגדרה סיסמה!"
@@ -3483,10 +3485,10 @@ msgid "Noise:"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3530,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 +3581,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 +3756,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 +3984,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 ""
 
@@ -4029,7 +4032,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4059,7 +4062,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 +4075,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 +4132,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 +4199,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 +4209,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,7 +4217,7 @@ 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 ""
 
@@ -4347,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"
@@ -4393,11 +4396,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 +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 ""
 
@@ -4479,8 +4482,8 @@ 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 ""
 
@@ -4616,7 +4619,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 +4632,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 +4723,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 +4736,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 "דלג אל הניווט"
 
@@ -4851,11 +4854,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 +4868,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 +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 "מצב"
 
@@ -4892,7 +4895,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 +4908,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 +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 ""
 
@@ -4966,15 +4969,15 @@ 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
 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 +4993,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 +5215,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 +5226,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 +5247,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 +5280,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 +5349,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 +5585,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 +5696,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 +5745,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 +5823,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 +5857,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 +5907,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 +5933,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 +5957,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 +6046,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 +6105,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 +6142,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 +6229,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 +6259,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 +6272,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 +6301,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 +6361,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 +6389,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 +6437,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 699f85a6e53b46440f6a77cd7ad93fa5b769b59c..24427c3e2fcec0498d4b5007553080f82d96c87b 100644 (file)
--- a/modules/luci-base/po/hi/base.po
+++ b/modules/luci-base/po/hi/base.po
@@ -144,15 +144,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 +162,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,7 +187,7 @@ 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 ""
 
@@ -200,28 +200,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 +340,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 +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 ""
 
@@ -408,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 ""
 
@@ -433,12 +434,12 @@ 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
 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
@@ -450,7 +451,7 @@ msgid "Advanced Settings"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -467,17 +468,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 +502,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 +518,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 +689,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 +697,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"
@@ -802,10 +803,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 +820,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 +840,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 +1026,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 +1059,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 +1098,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 +1191,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 +1227,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 +1235,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 +1268,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 +1407,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 +1464,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 +1498,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 +1506,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 +1534,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 +1546,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 +1687,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,19 +1807,26 @@ 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 ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1903,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 +1912,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 +1939,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 +1963,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 +2091,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 +2130,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 +2183,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 +2207,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 +2220,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,7 +2250,7 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2253,13 +2258,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 +2332,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 +2344,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 +2413,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 +2505,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 +2513,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 +2565,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 +2626,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 +2681,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 +2704,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 +2781,20 @@ 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:36
+msgid "Lease time remaining"
+msgstr ""
+
+#: 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 +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 ""
 
@@ -2843,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"
@@ -2871,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 ""
 
@@ -2891,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 ""
 
@@ -2904,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 ""
@@ -2940,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 ""
 
@@ -2953,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 ""
 
@@ -2985,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 ""
 
@@ -2997,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 ""
 
@@ -3094,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 ""
 
@@ -3333,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
@@ -3345,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 ""
 
@@ -3410,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,10 +3461,10 @@ msgid "Noise:"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +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 ""
 
@@ -3555,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 ""
 
@@ -3730,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 ""
 
@@ -3958,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 ""
 
@@ -4005,7 +4008,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4035,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 ""
 
@@ -4048,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 ""
 
@@ -4105,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"
@@ -4172,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"
@@ -4182,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 ""
 
@@ -4190,7 +4193,7 @@ 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 ""
 
@@ -4323,7 +4326,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 +4372,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 +4428,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 ""
 
@@ -4455,8 +4458,8 @@ 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 ""
 
@@ -4592,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 ""
 
@@ -4605,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 ""
 
@@ -4696,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 ""
 
@@ -4709,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 ""
 
@@ -4825,11 +4828,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 +4842,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 +4853,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 +4866,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 +4879,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 +4892,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 +4940,15 @@ 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
 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 +4964,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 +5186,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 +5197,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 +5218,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 +5251,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 +5319,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 +5555,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 +5666,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 +5715,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 +5793,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 +5827,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 +5877,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 +5903,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 +5927,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 +6016,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 +6075,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 +6112,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 +6199,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 +6229,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 +6242,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 +6271,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 +6331,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 +6359,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 430b6225707b9650afa91402338d3364f375278b..c25992b7cc9d48610ddea102d675332ccf0916cc 100644 (file)
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -150,15 +150,15 @@ msgstr "802.11w újrapróbálás időkorlátja"
 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"
@@ -170,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>-cím"
@@ -197,7 +197,7 @@ 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)"
 
@@ -210,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> neve"
 
-#: 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 "<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 +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"
@@ -235,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"
 
@@ -346,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"
@@ -357,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"
@@ -412,7 +414,7 @@ msgstr "Példány hozzáadása"
 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ányutótag hozzáadása a hosts fájlokból kiszolgált nevekhez"
 
@@ -425,11 +427,11 @@ msgstr "Új csatoló hozzáadása…"
 msgid "Add peer"
 msgstr "Partner hozzáadása"
 
-#: 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 gépek fájljai"
 
-#: 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"
 
@@ -450,12 +452,12 @@ 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
 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
@@ -467,7 +469,7 @@ msgid "Advanced Settings"
 msgstr "Speciális beállítások"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr "Összesített átviteli teljesítmény (ACTATP)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -484,18 +486,18 @@ msgstr "Álnév csatoló"
 msgid "Alias of \"%s\""
 msgstr "„%s” álneve"
 
-#: 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 "Összes kiszolgáló"
 
-#: 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"
 
@@ -522,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"
 
@@ -540,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 ""
@@ -724,7 +726,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"
 
@@ -732,11 +734,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"
@@ -863,7 +865,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)"
@@ -885,7 +887,7 @@ msgstr "Az alagút kötése ehhez a csatolóhoz (elhagyható)."
 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"
 
@@ -1088,10 +1090,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…"
 
@@ -1125,7 +1128,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"
@@ -1165,7 +1167,7 @@ msgstr "Kapcsolódási kísérlet sikertelen"
 msgid "Connection lost"
 msgstr "A kapcsolat elveszett"
 
-#: 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"
 
@@ -1266,8 +1268,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"
 
@@ -1302,7 +1304,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"
 
@@ -1310,11 +1312,11 @@ msgstr "DNS továbbítások"
 msgid "DNS-Label / FQDN"
 msgstr "DNS-címke / 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 ellenőrzés előjel nélkül"
 
@@ -1343,6 +1345,7 @@ msgstr "DSL vonalmód"
 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"
@@ -1484,8 +1487,7 @@ msgstr "Az eszköz elérhetetlen!"
 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"
 
@@ -1544,7 +1546,7 @@ msgstr "Letiltva"
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Hozzárendelés megszüntetése alacsony nyugtázásnál"
 
-#: 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 "Külső RFC1918 válaszok elvetése"
 
@@ -1578,30 +1580,30 @@ 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 azokat a kéréseket, amelyeket nem tudnak megválaszolni a "
 "nyilvános névkiszolgálók"
 
-#: 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"
 
@@ -1621,11 +1623,11 @@ msgstr "Valóban törölni szeretné az összes beállítást?"
 msgid "Do you really want to recursively delete the directory \"%s\" ?"
 msgstr "Valóban törölni szeretné rekurzívan a(z) „%s” könyvtárat?"
 
-#: 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"
 
@@ -1633,7 +1635,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"
@@ -1786,7 +1788,7 @@ msgstr "NTP-ügyfél 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"
 
@@ -1908,19 +1910,26 @@ 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"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a hexadecimal assignment hint"
 msgstr "Hexadecimális hozzárendelési tipp várt"
 
 #: 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 "Elvárás: %s"
 
@@ -1999,7 +2008,7 @@ msgstr "A fájl nem érhető el"
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: 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 "Az ügyfeleknek meghirdetett rendszerindító lemezkép fájlneve"
 
@@ -2008,11 +2017,11 @@ msgstr "Az ügyfeleknek meghirdetett rendszerindító lemezké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 "Személyes 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"
 
@@ -2037,7 +2046,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"
 
@@ -2061,7 +2070,7 @@ msgstr "Firmware fájl"
 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ásport a kimenő DNS-lekérdezéseknél"
 
@@ -2193,7 +2202,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
@@ -2222,7 +2231,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"
@@ -2232,9 +2242,9 @@ msgstr "Globális beállítások"
 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…"
@@ -2287,6 +2297,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
@@ -2311,7 +2322,7 @@ msgid "Host-Uniq tag content"
 msgstr "Egyedi gépcímketartalom"
 
 #: 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
@@ -2324,7 +2335,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"
 
@@ -2354,7 +2365,7 @@ msgstr "IP-cím"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr "Az IP-cím érvénytelen"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2362,13 +2373,13 @@ msgstr "Az IP-cím érvénytelen"
 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"
@@ -2436,6 +2447,8 @@ msgstr "IPv4 az IPv4-ben (RFC2003)"
 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
@@ -2446,8 +2459,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"
@@ -2517,6 +2528,7 @@ msgstr "IPv6-irányított előtag"
 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"
@@ -2617,10 +2629,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"
 
@@ -2628,7 +2640,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 feloldási fájl figyelmen kívül hagyása"
 
@@ -2748,7 +2760,7 @@ msgstr "A csatoló nincs jelen vagy még nincs kapcsolódva."
 
 #: 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"
 
@@ -2809,9 +2821,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!"
@@ -2832,8 +2844,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ó"
 
@@ -2909,20 +2921,24 @@ msgstr "Késleltetés"
 msgid "Leaf"
 msgstr "Levél"
 
-#: 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 "Bérleti idő"
 
-#: 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:36
+msgid "Lease time remaining"
+msgstr "A bérletből hátralévő idő"
+
+#: 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"
-msgstr "A bérletből hátralévő idő"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2945,13 +2961,13 @@ 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 ""
 "DNS-szolgáltatás korlátozása azokra az alhálózati csatolókra, amelyeken DNS-"
 "t szolgálunk ki."
 
-#: 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."
 
@@ -2975,7 +2991,7 @@ msgstr "Vonal működési ideje"
 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"
@@ -3016,15 +3032,15 @@ msgstr ""
 msgid "List of SSH key files for auth"
 msgstr "SSH kulcsfájlok listája a hitelesítéshez"
 
-#: 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 "Tartományok listája, amelyeknél az RFC1918 válaszok engedélyezettek"
 
-#: 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"
 
@@ -3036,12 +3052,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"
 
@@ -3049,10 +3065,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…"
@@ -3085,7 +3097,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"
 
@@ -3098,11 +3110,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"
@@ -3110,17 +3122,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"
@@ -3128,7 +3140,7 @@ msgstr ""
 "Gépnév behatárolása 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"
 
@@ -3136,7 +3148,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 "Lekérdezések naplózása"
 
@@ -3148,7 +3160,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"
 
@@ -3247,15 +3259,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 "Egyidejű DNS-lekérdezések legnagyobb megengedett 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 legnagyobb megengedett mérete"
 
@@ -3488,11 +3500,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
@@ -3500,14 +3511,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"
 
@@ -3565,13 +3577,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!"
@@ -3614,10 +3626,10 @@ msgid "Noise:"
 msgstr "Zaj:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive CRC errors (CRC_P)"
 msgstr "Nem megelőző 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 "Nincs helyettesítő karakter"
 
@@ -3659,11 +3671,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 "
@@ -3712,7 +3724,7 @@ msgstr "Kapcsolatkori útválasztás"
 msgid "On-State Delay"
 msgstr "Állapotkori 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 "A gépnév vagy a MAC-cím egyikét meg kell adni!"
 
@@ -3903,7 +3915,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ő"
 
@@ -4131,8 +4143,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 +4191,7 @@ msgid "Power Management Mode"
 msgstr "Energiakezelési mód"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr "Megelőző CRC-hibák (CRCP_P)"
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4210,7 +4223,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 "Figyelés megakadályozása ezeken a csatolókon."
 
@@ -4223,7 +4236,7 @@ msgid "Private Key"
 msgstr "Személyes kulcs"
 
 #: 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"
 
@@ -4287,7 +4300,7 @@ msgstr "QMI sejtes"
 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"
@@ -4358,7 +4371,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"
@@ -4370,7 +4383,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"
 
@@ -4378,7 +4391,7 @@ 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"
 
@@ -4518,7 +4531,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"
@@ -4566,11 +4579,11 @@ msgstr "Számlálók nullázása"
 msgid "Reset to defaults"
 msgstr "Visszaállítás az alapértelmezettekre"
 
-#: 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 "Fájl feloldása"
 
@@ -4622,7 +4635,7 @@ msgstr "A kérés visszavonása meghiúsult <code>%h</code> állapotkóddal"
 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"
 
@@ -4652,8 +4665,8 @@ 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"
 
@@ -4796,7 +4809,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"
 
@@ -4809,7 +4822,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"
 
@@ -4903,7 +4916,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"
 
@@ -4916,11 +4929,11 @@ msgstr "A ZRam eszköz mérete megabájtban"
 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"
 
@@ -5047,11 +5060,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"
 
@@ -5061,7 +5074,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 "
@@ -5076,10 +5089,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"
 
@@ -5089,7 +5102,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"
 
@@ -5102,11 +5115,11 @@ msgstr "Erős"
 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"
 
@@ -5115,7 +5128,7 @@ msgid "Swap free"
 msgstr "Szabad cserehely"
 
 #: 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ó"
 
@@ -5165,15 +5178,15 @@ msgstr "Szinkronizálás NTP-kiszolgálóval"
 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
 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ó"
 
@@ -5189,11 +5202,11 @@ msgstr "Rendszernapló-puffer mérete"
 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"
 
@@ -5257,8 +5270,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:"
@@ -5369,8 +5382,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ő "
@@ -5458,7 +5471,8 @@ msgstr ""
 "A feltöltött lemezképfájl nem tartalmaz támogatott formátumot. Győződjön meg "
 "arról, hogy az általános lemezképformátumot választotta-e ki a platformjához."
 
-#: 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"
@@ -5468,9 +5482,9 @@ msgstr "Nincsenek aktív bérletek"
 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 "
@@ -5491,7 +5505,7 @@ msgstr "Ez a hitelesítéstípus nem alkalmazható a kijelölt EAP módszerhez."
 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 "
@@ -5526,8 +5540,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 ""
@@ -5537,7 +5551,7 @@ msgstr ""
 "Ez az alagút-közvetítő által hozzárendelt helyi végpont címe, amely "
 "á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"
@@ -5618,14 +5632,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"
 
@@ -5858,7 +5873,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"
 
@@ -5969,7 +5984,7 @@ msgstr "Átjáró metrikájának használata"
 msgid "Use routing table"
 msgstr "Útválasztási táblázat 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 "
@@ -6026,7 +6041,7 @@ msgstr "VDSL"
 msgid "VLANs on %q"
 msgstr "VLAN-ok ezen: %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"
 
@@ -6106,10 +6121,6 @@ msgstr ""
 "A WPA titkosításához „wpa_supplicant” (ügyfél módnál) vagy „hostapd” ("
 "hozzáférési pontnál és eseti módban) 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 "Várakozás az eszközre…"
@@ -6149,9 +6160,9 @@ msgstr "Szélesség"
 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 "Vezeték nélküli"
 
@@ -6199,7 +6210,7 @@ msgstr "Vezeték nélküli hálózat letiltva"
 msgid "Wireless network is enabled"
 msgstr "Vezeték né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"
 
@@ -6232,9 +6243,9 @@ msgstr ""
 "előkészítő parancsfájlokat, mint például a „network” parancsfájlt, akkor 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."
@@ -6258,7 +6269,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"
 
@@ -6347,19 +6358,20 @@ msgstr "letiltva"
 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
@@ -6407,7 +6419,7 @@ msgstr "8 és 63 karakter közötti kulcs"
 msgid "key with either 5 or 13 characters"
 msgstr "kulcs 5 vagy 13 karakterrel"
 
-#: 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"
 
@@ -6444,16 +6456,16 @@ msgstr "nincs jelen"
 #: 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"
@@ -6531,8 +6543,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"
@@ -6560,6 +6573,7 @@ msgid "untagged"
 msgstr "címké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"
 
@@ -6572,6 +6586,7 @@ msgid "valid IPv4 CIDR"
 msgstr "érvényes 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 "érvényes IPv4-cím"
 
@@ -6600,6 +6615,7 @@ msgid "valid IPv6 CIDR"
 msgstr "érvényes 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 "érvényes IPv6-cím"
 
@@ -6659,6 +6675,9 @@ msgstr "érvényes gép: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 "érvényes gépnév"
 
@@ -6684,6 +6703,7 @@ msgid "valid port or port range (port1-port2)"
 msgstr "érvényes port vagy porttartomány (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 "érvényes portérték"
 
@@ -6731,6 +6751,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 68674faead8751ad189744bbfb112cdc3756b4f6..c728464ebd2433054c0591d6759ef6bce96f24ab 100644 (file)
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -150,15 +150,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 +171,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,7 +199,7 @@ 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 ""
 
@@ -212,16 +212,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 +229,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 +237,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 +362,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 +418,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 +432,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 +457,12 @@ 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
 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
@@ -473,7 +474,7 @@ msgid "Advanced Settings"
 msgstr "Opzioni Avanzate"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -490,17 +491,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 +527,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 +544,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 +717,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 +725,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"
@@ -830,10 +831,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 +851,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 +871,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 +1067,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 +1100,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 +1139,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 +1234,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 +1270,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 +1278,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 +1311,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 +1453,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 +1512,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 +1546,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 +1557,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 +1587,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 +1599,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 +1747,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,19 +1867,26 @@ 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"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1965,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 +1974,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 +2001,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 +2025,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 +2153,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 +2194,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 +2249,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 +2274,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 +2287,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"
 
@@ -2312,7 +2317,7 @@ msgstr "Indirizzo IP"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2320,13 +2325,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 +2399,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 +2411,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 +2480,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 +2583,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 +2591,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 +2643,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 +2704,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 +2762,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 +2785,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,20 +2862,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Tempo contratto residuo"
+
+#: 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"
-msgstr "Tempo contratto residuo"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2896,11 +2902,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 +2930,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 +2960,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 +2980,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 +2993,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 +3025,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 +3038,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 +3051,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 +3068,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 +3076,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 +3088,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 +3185,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 ""
 
@@ -3424,11 +3426,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 +3437,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 +3503,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!"
@@ -3550,10 +3552,10 @@ msgid "Noise:"
 msgstr "Rumore:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3597,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 +3648,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 +3825,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 +4053,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 ""
 
@@ -4098,7 +4101,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4128,7 +4131,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 +4144,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 +4201,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 +4268,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 +4280,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,7 +4288,7 @@ 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 ""
 
@@ -4418,7 +4421,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 +4467,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 +4523,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 ""
 
@@ -4550,8 +4553,8 @@ 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"
 
@@ -4689,7 +4692,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 +4705,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 +4796,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 +4809,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"
 
@@ -4930,11 +4933,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 +4947,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 +4962,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 +4975,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 +4988,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 +5001,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 +5049,15 @@ 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
 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 +5073,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 +5306,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 +5317,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 +5338,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 +5371,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 +5448,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 +5684,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 +5795,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 +5850,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 +5930,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 +5964,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 +6014,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 +6045,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 +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 "qualsiasi"
 
@@ -6159,13 +6160,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 +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 "File <abbr title=\"Sistema Nome Dominio\">DNS</abbr> locale"
 
@@ -6256,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 "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 +6345,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 +6375,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 +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 ""
 
@@ -6412,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 ""
 
@@ -6471,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 ""
 
@@ -6496,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 ""
 
@@ -6543,6 +6553,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 4a0d21eef1d1ba0a2bff6027dda0b557798d5fe2..1813a646f27384fd348649ff7015233be43cd986 100644 (file)
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -149,15 +149,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 +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>-アドレス"
@@ -196,7 +196,7 @@ 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進数)"
@@ -210,16 +210,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 +227,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 +235,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 +355,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 +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 ""
 "hosts ファイルにより解決される名前にローカルドメイン サフィックスを付加しま"
@@ -425,11 +426,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 +451,12 @@ 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
 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,7 +468,7 @@ msgid "Advanced Settings"
 msgstr "詳細設定"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -484,18 +485,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 +520,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 +537,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 +719,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 +727,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"
@@ -832,10 +833,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 +853,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 +875,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 +1074,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 +1111,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 +1150,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 +1250,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 +1286,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 +1294,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 +1327,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 +1468,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 +1527,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 +1561,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 +1573,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 +1602,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 +1614,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 +1766,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,19 +1888,26 @@ 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 "拡張ホスト設定"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1986,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 +1995,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 +2024,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 +2048,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 +2179,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 +2218,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 +2272,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 +2297,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 +2310,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 "ホスト名"
 
@@ -2335,7 +2340,7 @@ msgstr "IPアドレス"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr "無効な IP アドレスです"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2343,13 +2348,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 +2422,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 +2434,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 +2503,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 +2603,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 +2611,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 +2665,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 +2727,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 +2785,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 +2808,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,20 +2885,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "残りリース時間"
+
+#: 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"
-msgstr "残りリース時間"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2921,13 +2925,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 +2955,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 +2985,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 +3007,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 +3020,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 +3052,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 +3065,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 +3077,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 +3095,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 +3103,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 +3115,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 +3214,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 パケットサイズの許可される最大数"
 
@@ -3455,11 +3455,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 +3466,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 +3532,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 "パスワードが設定されていません!"
@@ -3581,10 +3581,10 @@ msgid "Noise:"
 msgstr "ノイズ:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3626,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 +3679,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 +3864,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 +4092,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"
 
@@ -4139,7 +4140,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4171,7 +4172,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 +4185,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 +4246,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 +4317,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 +4329,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,7 +4337,7 @@ 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リバインディング・プロテクション"
 
@@ -4471,7 +4472,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 +4520,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 +4576,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経由でファイルを取り扱う際のルートディレクトリ"
 
@@ -4605,8 +4606,8 @@ 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 "経路情報"
 
@@ -4749,7 +4750,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 +4763,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 +4855,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 +4868,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 "ナビゲーションへ移動"
 
@@ -4993,11 +4994,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 +5008,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 +5022,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 +5035,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 +5048,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 +5061,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 +5111,15 @@ 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
 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 +5135,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 +5393,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 +5404,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 +5427,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 +5470,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 +5547,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 +5787,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 +5898,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 +5951,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 +6032,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 +6069,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 +6119,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 +6151,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 +6175,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 +6264,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 +6325,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 +6362,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 +6449,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 +6479,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 +6492,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 +6521,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 +6581,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 +6609,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 +6657,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 3f6d50a67829c2a6dfedaaed38fcbbd4b5b3b16c..b285cf33fb8c60af8eeb31a164b8838fdb0636bf 100644 (file)
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -148,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> 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 +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>-주소"
@@ -191,7 +191,7 @@ 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 ""
 
@@ -204,16 +204,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 +221,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 +229,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 +347,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 +403,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 +416,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 +441,12 @@ 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
 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
@@ -457,7 +458,7 @@ msgid "Advanced Settings"
 msgstr "고급 설정"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -474,17 +475,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 +509,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 +525,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 +696,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 +704,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"
@@ -809,10 +810,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 +830,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 +850,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 +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 "Data 를 수집중입니다..."
 
@@ -1079,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 "설정"
@@ -1119,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 "연결"
 
@@ -1214,8 +1211,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 +1247,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 +1255,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 +1288,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 +1430,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 +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 ""
 
@@ -1526,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>-"
@@ -1537,15 +1534,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 +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 ""
 
@@ -1577,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"
@@ -1722,7 +1719,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,19 +1839,26 @@ 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 ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1935,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 +1944,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 +1971,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 +1995,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 +2123,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 +2162,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 +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
@@ -2235,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
@@ -2248,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 "호스트이름"
 
@@ -2278,7 +2283,7 @@ msgstr "IP 주소"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2286,13 +2291,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 +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
@@ -2370,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"
@@ -2441,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"
@@ -2532,7 +2538,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 +2546,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 +2598,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 +2659,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 +2714,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 +2737,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,20 +2814,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "남아있는 임대 시간"
+
+#: 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"
-msgstr "남아있는 임대 시간"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2848,12 +2854,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 +2883,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 +2911,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 +2932,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 +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 ""
@@ -2975,7 +2977,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 +2990,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 +3022,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 +3034,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 +3131,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 패킷 크기"
 
@@ -3368,11 +3370,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 +3381,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 +3447,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 "암호 설정을 해주세요!"
@@ -3494,10 +3496,10 @@ msgid "Noise:"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3541,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 +3592,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 +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 "개요"
 
@@ -3995,8 +3997,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 ""
 
@@ -4042,7 +4045,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4072,7 +4075,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 +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 "프로세스"
 
@@ -4142,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"
@@ -4209,7 +4212,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 +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 "실시간 그래프"
 
@@ -4229,7 +4232,7 @@ 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 ""
 
@@ -4362,7 +4365,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 +4411,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 +4467,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 디렉토리"
 
@@ -4494,8 +4497,8 @@ 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 경로"
 
@@ -4633,7 +4636,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 +4649,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 +4740,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 +4753,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 ""
 
@@ -4866,11 +4869,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 +4883,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 +4897,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 +4910,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 +4923,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 +4936,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 +4984,15 @@ 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
 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 +5008,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 +5235,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 +5246,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 +5269,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 +5307,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 +5379,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 +5615,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 +5726,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 +5780,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 +5858,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 +5892,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 +5942,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 +5972,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 +5996,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 +6085,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 +6146,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 +6183,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 +6270,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 +6300,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 +6313,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 +6342,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 +6402,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 +6430,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 +6478,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 342bfca90d11b0e2e1b7e5a6edba1c15b5ee3155..1e645e55b62d66bc2986fec1df154ef21447aedd 100644 (file)
--- a/modules/luci-base/po/mr/base.po
+++ b/modules/luci-base/po/mr/base.po
@@ -145,15 +145,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 +163,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,7 +188,7 @@ 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 ""
 
@@ -201,28 +201,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 +338,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 +394,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 +407,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 +432,12 @@ 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
 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
@@ -448,7 +449,7 @@ msgid "Advanced Settings"
 msgstr "प्रगत सेटिंग्ज"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -465,17 +466,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 +500,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 +516,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 +687,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 +695,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"
@@ -800,10 +801,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 +818,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 +838,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 +1024,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 +1057,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 +1096,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 +1189,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 +1225,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 +1233,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 +1266,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 +1405,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 +1462,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 +1496,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 +1504,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 +1532,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 +1544,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 +1685,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,19 +1805,26 @@ 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 ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1901,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 +1910,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 +1937,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 +1961,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 +2089,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 +2128,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 +2181,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 +2205,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 +2218,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 ""
 
@@ -2243,7 +2248,7 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2251,13 +2256,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 +2330,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 +2342,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 +2411,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 +2503,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 +2511,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 +2563,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 +2624,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 +2679,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 +2702,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 +2779,20 @@ 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:36
+msgid "Lease time remaining"
+msgstr ""
+
+#: 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 +2819,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 +2847,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 +2875,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 +2895,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 ""
 
@@ -2938,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 ""
 
@@ -2951,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 ""
 
@@ -2983,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 ""
 
@@ -2995,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 ""
 
@@ -3092,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 ""
 
@@ -3331,11 +3337,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 +3348,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 +3414,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 ""
@@ -3457,10 +3463,10 @@ msgid "Noise:"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3508,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 +3559,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 +3734,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 +3962,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 ""
 
@@ -4003,7 +4010,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4033,7 +4040,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 +4053,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 +4110,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 +4177,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 +4187,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,7 +4195,7 @@ 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 ""
 
@@ -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 ""
 
@@ -4453,8 +4460,8 @@ 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 ""
 
@@ -4590,7 +4597,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 +4610,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 +4701,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 +4714,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 ""
 
@@ -4823,11 +4830,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 +4844,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 +4855,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 +4868,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 +4881,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 +4894,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 +4942,15 @@ 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
 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 +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 ""
 
@@ -5181,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"
@@ -5191,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 "
@@ -5212,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 "
@@ -5245,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"
@@ -5313,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 ""
 
@@ -5548,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 ""
 
@@ -5659,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 "
@@ -5708,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 ""
 
@@ -5786,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 ""
@@ -5824,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 ""
 
@@ -5874,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 ""
 
@@ -5900,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."
@@ -5924,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 ""
 
@@ -6013,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"
@@ -6071,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 ""
 
@@ -6108,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 ""
@@ -6195,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"
@@ -6224,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 ""
 
@@ -6236,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 ""
 
@@ -6264,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 ""
 
@@ -6323,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 ""
 
@@ -6348,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 ""
 
@@ -6394,3 +6408,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 35d70502a75113896ee26f500de7c0d9bde283e2..638823f06307856c7211887918003c9ad6ed7880 100644 (file)
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -148,15 +148,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 +167,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,7 +192,7 @@ 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 ""
 
@@ -205,28 +205,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 +342,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 +398,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 +411,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 +436,12 @@ 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
 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
@@ -452,7 +453,7 @@ msgid "Advanced Settings"
 msgstr "Tetapan Lanjutan"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -469,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 ""
 
@@ -503,7 +504,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 +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 ""
@@ -690,7 +691,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 +699,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"
@@ -804,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"
@@ -825,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)"
@@ -845,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 ""
 
@@ -1031,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 "Mengumpul data..."
 
@@ -1063,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 "Konfigurasi"
@@ -1103,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 ""
 
@@ -1196,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 ""
 
@@ -1232,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 ""
 
@@ -1240,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 ""
 
@@ -1273,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 ""
@@ -1411,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 ""
 
@@ -1469,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 ""
 
@@ -1504,7 +1501,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>-"
@@ -1516,15 +1513,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 ""
 
@@ -1544,11 +1541,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 ""
 
@@ -1556,7 +1553,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"
@@ -1698,7 +1695,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 ""
 
@@ -1818,19 +1815,26 @@ 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 ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 ""
 
@@ -1907,7 +1911,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 ""
 
@@ -1916,11 +1920,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"
 
@@ -1943,7 +1947,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"
 
@@ -1967,7 +1971,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 ""
 
@@ -2095,7 +2099,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
@@ -2134,9 +2138,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 ""
@@ -2189,6 +2193,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
@@ -2212,7 +2217,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
@@ -2225,7 +2230,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"
 
@@ -2255,7 +2260,7 @@ msgstr "Alamat IP"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2263,13 +2268,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 ""
@@ -2337,6 +2342,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
@@ -2347,8 +2354,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"
@@ -2418,6 +2423,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"
@@ -2514,7 +2520,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"
 
@@ -2522,7 +2528,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"
 
@@ -2574,10 +2580,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 ""
@@ -2639,7 +2641,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"
 
@@ -2697,9 +2699,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 ""
@@ -2721,8 +2723,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"
 
@@ -2798,20 +2800,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Sisa masa penyewaan"
+
+#: 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"
-msgstr "Sisa masa penyewaan"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2834,11 +2840,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 ""
 
@@ -2862,7 +2868,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"
@@ -2890,15 +2896,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 ""
 
@@ -2910,12 +2916,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"
 
@@ -2923,10 +2929,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 ""
@@ -2959,7 +2961,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 ""
 
@@ -2972,31 +2974,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"
 
@@ -3004,7 +3006,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"
 
@@ -3016,7 +3018,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"
 
@@ -3113,15 +3115,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 ""
 
@@ -3354,11 +3356,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
@@ -3366,14 +3367,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 ""
 
@@ -3431,13 +3433,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 ""
@@ -3480,10 +3482,10 @@ msgid "Noise:"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 ""
 
@@ -3525,11 +3527,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 ""
 
@@ -3576,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 ""
 
@@ -3751,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 "Keseluruhan"
 
@@ -3979,8 +3981,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 ""
 
@@ -4026,7 +4029,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4056,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 ""
 
@@ -4069,7 +4072,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"
 
@@ -4126,7 +4129,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"
@@ -4194,7 +4197,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"
@@ -4204,7 +4207,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 ""
 
@@ -4212,7 +4215,7 @@ 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 ""
 
@@ -4345,7 +4348,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"
@@ -4391,11 +4394,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 ""
 
@@ -4447,7 +4450,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 ""
 
@@ -4477,8 +4480,8 @@ 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"
 
@@ -4616,7 +4619,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 +4632,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"
 
@@ -4720,7 +4723,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 ""
 
@@ -4733,11 +4736,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"
 
@@ -4849,11 +4852,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"
 
@@ -4863,7 +4866,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 "
@@ -4874,10 +4877,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"
 
@@ -4887,7 +4890,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"
 
@@ -4900,11 +4903,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 ""
 
@@ -4913,7 +4916,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"
 
@@ -4961,15 +4964,15 @@ 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
 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"
 
@@ -4985,11 +4988,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 ""
 
@@ -5217,7 +5220,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"
@@ -5227,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 "
@@ -5248,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 "
@@ -5281,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"
@@ -5353,14 +5357,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"
 
@@ -5588,7 +5593,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"
 
@@ -5699,7 +5704,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 "
@@ -5748,7 +5753,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 ""
 
@@ -5828,10 +5833,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 ""
@@ -5866,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 ""
 
@@ -5916,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 ""
 
@@ -5942,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."
@@ -5966,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 ""
 
@@ -6055,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"
@@ -6113,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 "Fail DNS tempatan"
 
@@ -6150,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 ""
@@ -6237,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"
@@ -6266,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 ""
 
@@ -6278,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 ""
 
@@ -6306,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 ""
 
@@ -6365,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 ""
 
@@ -6390,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 ""
 

diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index 430e3b552b25829f5e2ed1f5a6f5b04d254dcaa0..74801b3e4306469aceb6d236e258a6527490acd7 100644 (file)
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -145,15 +145,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 +165,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,7 +192,7 @@ 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 ""
 
@@ -205,16 +205,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 +222,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 +230,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 +353,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 +409,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 +422,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 +447,12 @@ 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
 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
@@ -463,7 +464,7 @@ msgid "Advanced Settings"
 msgstr "Avanserte Innstillinger"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -480,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 ""
 
@@ -514,7 +515,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 +531,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 +702,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 +710,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"
@@ -815,10 +816,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 +836,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 +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 "Overstyr falske NX Domener"
 
@@ -1055,10 +1052,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 +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 "Konfigurasjon"
@@ -1127,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 "Tilkoblinger"
 
@@ -1222,8 +1219,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 +1255,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 +1263,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 +1296,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 +1437,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 +1496,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 +1530,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 +1542,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 +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 "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 +1584,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 +1732,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,19 +1852,26 @@ 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"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1949,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 +1958,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 +1985,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 +2009,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 +2138,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 +2177,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 +2232,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 +2257,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 +2270,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"
 
@@ -2295,7 +2300,7 @@ msgstr "IP adresse"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2303,13 +2308,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 +2382,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 +2394,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 +2463,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 +2559,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 +2567,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 +2619,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 +2680,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 +2738,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 +2761,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 +2838,20 @@ 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:36
+msgid "Lease time remaining"
+msgstr ""
+
+#: 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 +2878,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 +2906,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 +2936,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 +2957,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 +2970,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 +3002,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 +3015,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 +3028,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 +3044,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 +3052,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 +3064,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 +3161,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"
 
@@ -3400,11 +3402,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 +3413,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 +3479,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!"
@@ -3526,10 +3528,10 @@ msgid "Noise:"
 msgstr "Støy:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3573,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 +3624,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 +3801,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 +4029,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"
 
@@ -4074,7 +4077,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4106,7 +4109,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 +4122,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 +4179,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 +4246,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 +4258,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,7 +4266,7 @@ 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"
 
@@ -4396,7 +4399,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 +4445,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 +4501,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"
 
@@ -4528,8 +4531,8 @@ 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"
 
@@ -4669,7 +4672,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 +4685,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 +4776,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 +4789,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"
 
@@ -4906,11 +4909,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 +4923,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 +4937,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 +4950,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 +4963,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 +4976,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 +5024,15 @@ 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
 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 +5048,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 +5289,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 +5300,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 +5323,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 +5363,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 +5438,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 +5674,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 +5785,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 +5841,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 +5921,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 +5955,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 +6005,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 +6035,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 +6061,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 +6150,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 +6211,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 +6248,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 +6335,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 +6365,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 +6378,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 +6407,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 +6467,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 +6495,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 +6543,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 ecfe99ffaf4f90d5e9a9a1541b68b2222fad228c..001fcc05e2a64da6aef026493754420eaf7b7ca8 100644 (file)
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -150,15 +150,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 +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 "Adres <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -196,7 +196,7 @@ 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)"
 
@@ -209,16 +209,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 +226,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 +234,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 +362,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 +418,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 +431,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 +457,12 @@ 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
 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
@@ -473,7 +474,7 @@ msgid "Advanced Settings"
 msgstr "Ustawienia zaawansowane"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr "Agregacja siły transmisji (ACTATP)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -490,18 +491,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 +526,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 +543,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 +724,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 +732,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"
@@ -838,10 +839,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 +859,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 +881,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 +1080,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 +1118,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 +1157,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 +1258,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 +1294,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 +1302,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 +1335,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 +1476,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 +1535,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 +1569,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 +1581,17 @@ msgstr ""
 "System\">DNS</abbr>. Jest to serwer przekazujący (Forwarder) 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 +1613,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 +1625,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 +1778,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,19 +1902,26 @@ 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"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1999,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 +2008,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 +2037,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 +2061,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 +2192,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 +2233,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 +2290,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 +2314,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 +2327,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"
 
@@ -2352,7 +2357,7 @@ msgstr "Adres IP"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr "Nieprawidłowy adres IP"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2360,13 +2365,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 +2439,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 +2451,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 +2520,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 +2622,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 +2630,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 +2685,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 +2746,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 +2803,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 +2826,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,20 +2903,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Pozostały czas dzierżawy"
+
+#: 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"
-msgstr "Pozostały czas dzierżawy"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2938,12 +2943,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 +2972,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 +2988,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 +3003,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 +3012,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 +3033,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 +3046,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 +3078,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 +3091,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 +3103,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 +3120,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 +3128,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 +3140,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 +3239,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"
 
@@ -3479,11 +3480,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 +3491,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 +3557,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!"
@@ -3605,10 +3606,10 @@ msgid "Noise:"
 msgstr "Szum:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3651,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 +3704,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 +3893,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 +4121,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"
 
@@ -4167,7 +4169,7 @@ msgid "Power Management Mode"
 msgstr "Tryb zarządzania energią"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr "Przewidziane błedy CRC (CRCP_P)"
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4199,7 +4201,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 +4214,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 +4277,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 +4348,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 +4360,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,7 +4368,7 @@ 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ę"
 
@@ -4503,7 +4505,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 +4553,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 +4609,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"
 
@@ -4637,8 +4639,8 @@ 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"
 
@@ -4782,7 +4784,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 +4797,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 +4890,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 +4903,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"
 
@@ -5030,11 +5032,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 +5046,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 +5061,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 +5074,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 +5087,11 @@ msgstr "Silne"
 msgid "Submit"
 msgstr "Prześ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 +5100,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 +5149,15 @@ 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
 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 +5174,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 +5438,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 +5449,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 +5472,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 +5519,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 +5598,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 +5839,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 +5950,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 +6008,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 +6088,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 +6127,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 +6177,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 +6209,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 +6235,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 +6324,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 +6385,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 +6423,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 +6510,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 +6540,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 +6553,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 +6582,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 +6642,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 +6670,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 +6718,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 edcbcaa28398aab29911bd5bc167134ff719d436..fa1a791a9cd4b4c6d04c38fff732727452f8a940 100644 (file)
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -154,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 <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 +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>"
@@ -205,7 +205,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 "
@@ -220,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"
@@ -237,7 +237,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 +245,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 +376,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 +432,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 +445,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 +470,12 @@ 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
 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
@@ -486,7 +487,7 @@ msgid "Advanced Settings"
 msgstr "Configurações Avançadas"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 "Potência de Transmissão Agregada (<abbr title=\"Aggregate Transmit Power"
 "\">ACTATP</abbr>)"
@@ -505,11 +506,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 +518,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 +545,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 +563,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 +744,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 +752,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"
@@ -861,10 +862,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 +882,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 +904,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 +1105,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 +1143,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 +1182,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 +1283,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 +1319,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 +1327,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 +1362,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 +1505,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 +1564,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 +1599,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 +1611,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 +1643,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 +1655,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 +1813,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,19 +1939,26 @@ 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)"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +2042,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 +2051,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 +2081,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 +2105,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 +2206,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 +2237,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 +2278,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 +2337,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 +2363,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 +2376,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"
 
@@ -2403,7 +2408,7 @@ msgstr "Endereço IP"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr "O endereço IP é inválido"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2411,13 +2416,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 +2490,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 +2502,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 +2573,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 +2677,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 +2685,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 +2739,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 +2800,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 +2861,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 +2884,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,20 +2961,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Tempo restante da atribuição"
+
+#: 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"
-msgstr "Tempo restante da atribuição"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2995,13 +3001,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 +3031,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 +3071,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 +3096,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 +3109,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 +3141,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 +3154,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 +3167,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 +3185,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 +3193,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 +3205,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 +3308,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"
 
@@ -3547,11 +3549,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 +3560,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 +3626,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!"
@@ -3675,12 +3677,12 @@ msgid "Noise:"
 msgstr "Ruído:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive CRC errors (CRC_P)"
 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 +3724,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 +3775,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 +3969,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 +4197,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"
 
@@ -4242,7 +4245,7 @@ msgid "Power Management Mode"
 msgstr "Modo de Gerenciamento de Energia"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 "Erros CRC Preemptivos<abbr title=\"Pre-emptive CRC errors\">CRCP_P</abbr>"
 
@@ -4275,7 +4278,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 +4291,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 +4354,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 +4425,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 +4437,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,7 +4445,7 @@ 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\""
 
@@ -4581,7 +4584,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 +4632,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 +4689,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"
 
@@ -4716,8 +4719,8 @@ 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"
 
@@ -4861,7 +4864,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 +4877,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 +4975,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 +4988,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"
 
@@ -5115,11 +5118,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 +5132,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 +5147,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 +5160,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 +5173,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 +5186,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 +5236,15 @@ 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
 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 +5260,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 +5441,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 +5526,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 +5537,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 +5560,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 +5607,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 +5686,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 +5931,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 +6044,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 +6053,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 +6101,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 +6181,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 +6218,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 +6268,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 +6286,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 +6301,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 +6327,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 +6416,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 +6477,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 +6516,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 +6603,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 +6633,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 +6646,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 +6675,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 +6735,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 +6763,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 +6811,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 377dd916779edf0985d8490fd30d788e519cf489..695218eabb0a675853dd7bcbae4b255171336379 100644 (file)
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -152,17 +152,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 +175,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,7 +203,7 @@ 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>"
@@ -217,16 +217,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 +234,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 +242,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 +365,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 +421,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 +435,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 +460,12 @@ 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
 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
@@ -476,7 +477,7 @@ msgid "Advanced Settings"
 msgstr "Definições Avançadas"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 "Potência de Transmissão Agregada (<abbr title=\"Aggregate Transmit Power"
 "\">ACTATP</abbr>)"
@@ -495,11 +496,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 +508,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 +534,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 +551,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 +731,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 +739,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"
@@ -848,10 +849,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 +869,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 +891,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 +1090,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 +1128,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 +1167,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 +1268,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 +1304,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 +1312,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 +1345,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 +1487,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 +1546,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 +1580,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 +1592,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 +1622,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 +1634,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 +1788,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,19 +1912,26 @@ 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"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +2011,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 +2020,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 +2049,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 +2073,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 +2205,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 +2245,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 +2304,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 +2328,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 +2341,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"
 
@@ -2366,7 +2371,7 @@ msgstr "Endereço IP"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr "O endereço IP é inválido"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2374,13 +2379,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 +2453,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 +2465,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 +2534,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 +2636,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 +2644,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 +2698,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 +2759,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 +2817,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 +2840,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,20 +2917,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Tempo de concessão restante"
+
+#: 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"
-msgstr "Tempo de concessão restante"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2951,13 +2957,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 +2987,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 +3027,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 +3050,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 +3063,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 +3095,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 +3108,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 +3121,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 +3139,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 +3147,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 +3159,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 +3262,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"
 
@@ -3502,11 +3504,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 +3515,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 +3581,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!"
@@ -3630,12 +3632,12 @@ msgid "Noise:"
 msgstr "Ruído:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive CRC errors (CRC_P)"
 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 +3679,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 +3731,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 +3924,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 +4152,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"
 
@@ -4197,7 +4200,7 @@ msgid "Power Management Mode"
 msgstr "Modo de Gestão de Energia"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 "Erros CRC Preemptivos<abbr title=\"Pre-emptive CRC errors\">CRCP_P</abbr>"
 
@@ -4230,7 +4233,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 +4246,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 +4308,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 +4379,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 +4391,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,7 +4399,7 @@ 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"
 
@@ -4534,7 +4537,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 +4585,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 +4642,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"
 
@@ -4669,8 +4672,8 @@ 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"
 
@@ -4814,7 +4817,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 +4830,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 +4928,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 +4941,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"
 
@@ -5068,11 +5071,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 +5085,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 +5100,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 +5113,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 +5126,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 +5139,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 +5189,15 @@ 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
 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 +5213,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 +5460,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 +5479,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 +5490,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 +5513,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 +5559,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 +5637,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 +5882,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 +5995,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 +6052,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 +6132,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 +6170,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 +6220,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 +6253,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 +6279,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 +6368,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 +6429,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 +6467,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 +6554,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 +6584,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 +6597,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 +6626,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 +6686,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 +6714,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 +6762,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 3871a580c67f2d9dc31098bdc0c1b4c3b06b8850..d27807bd97f7d9793722865489e287f96327b7fa 100644 (file)
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -148,15 +148,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 +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 "Adresa <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -194,7 +194,7 @@ 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 ""
 
@@ -207,22 +207,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 +230,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 +349,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 +405,7 @@ msgstr "Adaugă instanţă"
 msgid "Add key"
 msgstr "Adaugă cheie"
 
-#: 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 +418,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 +443,12 @@ 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
 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
@@ -459,7 +460,7 @@ msgid "Advanced Settings"
 msgstr "Setari avansate"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -476,17 +477,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 +512,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 +528,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 +700,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 +708,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"
@@ -813,10 +814,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 +831,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 +851,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 +1040,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 "Colectare date..."
 
@@ -1075,7 +1073,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 +1112,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 +1205,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 +1241,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 +1249,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 +1282,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 +1421,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 +1480,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 +1514,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 +1522,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 +1550,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 +1562,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 +1703,7 @@ msgstr "Activează 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 "Activeaza serverul TFTP"
 
@@ -1826,19 +1823,26 @@ 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 "Exclude interfeţe"
 
-#: 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 ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1919,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 +1928,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 +1955,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 +1979,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 +2108,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 +2147,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 +2202,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 +2226,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 +2239,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"
 
@@ -2264,7 +2269,7 @@ msgstr "Adresa IP"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2272,13 +2277,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 +2351,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 +2363,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 +2432,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 +2524,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 +2532,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 +2584,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 +2645,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 +2703,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 +2726,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 +2803,20 @@ 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:36
+msgid "Lease time remaining"
+msgstr ""
+
+#: 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 +2843,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 +2871,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 +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 ""
 
@@ -2913,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 "Incarcarea"
 
@@ -2926,10 +2932,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 +2964,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 +2977,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 +3009,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 +3021,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 +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 "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 ""
 
@@ -3355,11 +3357,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 +3368,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 +3434,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 !"
@@ -3481,10 +3483,10 @@ msgid "Noise:"
 msgstr "Zgomot:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3528,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 +3579,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 +3754,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 +3982,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 ""
 
@@ -4027,7 +4030,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4057,7 +4060,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 +4073,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 +4130,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 +4197,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 +4209,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,7 +4217,7 @@ 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 ""
 
@@ -4347,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"
@@ -4393,11 +4396,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 +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 ""
 
@@ -4479,8 +4482,8 @@ 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"
 
@@ -4616,7 +4619,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 +4632,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 +4723,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 +4736,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 ""
 
@@ -4849,11 +4852,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 +4866,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 +4877,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 +4890,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 +4903,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 +4916,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 +4964,15 @@ 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
 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 +4988,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 +5210,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 +5221,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 +5244,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 +5277,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 +5345,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 +5581,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 +5692,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 +5741,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 +5821,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 +5855,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 +5905,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 +5931,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 +5955,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 +6044,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 +6103,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 +6140,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 +6227,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 +6257,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 +6270,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 +6299,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 +6359,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 +6387,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 +6435,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 3d3f722f3d434a8f5ff950ee0757cff62502b3f1..a56aa68a7020bc0adce01e1dce6def7f355a59ad 100644 (file)
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -153,15 +153,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 +173,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,7 +199,7 @@ 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)"
 
@@ -212,16 +212,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 +229,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 +237,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 +361,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 +417,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 +431,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 +456,12 @@ 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
 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
@@ -472,7 +473,7 @@ msgid "Advanced Settings"
 msgstr "Дополнительные настройки"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr "Aggregate Transmit Power (ACTATP)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -489,18 +490,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 +529,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 +548,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 +730,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 +738,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"
@@ -849,10 +850,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 +870,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 +892,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 +1094,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 +1131,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 +1170,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 +1270,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 +1306,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 +1314,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 +1347,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 +1489,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 +1548,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 +1582,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 +1594,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 +1624,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 +1636,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 +1788,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,19 +1910,26 @@ 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 "Расширять имена узлов"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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"
 
@@ -2004,7 +2008,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 "Имя загрузочного образа, извещаемого клиентам"
 
@@ -2013,11 +2017,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 "Фильтровать бесполезные"
 
@@ -2043,7 +2047,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 "Межсетевой экран"
 
@@ -2067,7 +2071,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-запросов"
 
@@ -2197,7 +2201,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
@@ -2236,9 +2240,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 "Перейти к настройке пароля..."
@@ -2291,6 +2295,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
@@ -2314,7 +2319,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
@@ -2327,7 +2332,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 "Имена хостов"
 
@@ -2357,7 +2362,7 @@ msgstr "IP-адрес"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr "Неверный IP-адрес"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2365,13 +2370,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"
@@ -2439,6 +2444,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
@@ -2449,8 +2456,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"
@@ -2520,6 +2525,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"
@@ -2621,7 +2627,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>"
 
@@ -2629,7 +2635,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"
 
@@ -2684,10 +2690,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 "Установить расширения протокола..."
@@ -2749,7 +2751,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 "Интерфейсы"
 
@@ -2808,9 +2810,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!"
@@ -2831,8 +2833,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 "Журнал ядра"
 
@@ -2908,20 +2910,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Оставшееся время аренды"
+
+#: 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"
-msgstr "Оставшееся время аренды"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2944,11 +2950,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 "Ограничьте прослушивание этих интерфейсов и замыкание на себя."
 
@@ -2972,7 +2978,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"
@@ -3012,15 +3018,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 "Интерфейс для входящих соединений"
 
@@ -3034,12 +3040,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 "Загрузка"
 
@@ -3047,10 +3053,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 "Загрузка содержимого директории…"
@@ -3083,7 +3085,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"
 
@@ -3096,11 +3098,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"
@@ -3109,17 +3111,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"
@@ -3127,7 +3129,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 "Локализовывать запросы"
 
@@ -3135,7 +3137,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 "Запись запросов"
 
@@ -3147,7 +3149,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 "Выйти"
 
@@ -3246,15 +3248,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"
 
@@ -3487,11 +3489,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
@@ -3499,14 +3500,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 "Образ системы для сетевой загрузки"
 
@@ -3564,13 +3566,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 "Пароль не установлен!"
@@ -3613,10 +3615,10 @@ msgid "Noise:"
 msgstr "Шум:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 "Не использовать wildcard"
 
@@ -3658,11 +3660,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 — отключить "
@@ -3711,7 +3713,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-адрес, либо имя хоста!"
 
@@ -3902,7 +3904,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 "Главное меню"
 
@@ -4130,8 +4132,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 "Пинг-запрос"
 
@@ -4177,7 +4180,7 @@ msgid "Power Management Mode"
 msgstr "Режим управления питанием"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr "Предварительные ошибки CRC (CRCP_P)"
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4209,7 +4212,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 "Запретить прослушивание этих интерфейсов."
 
@@ -4222,7 +4225,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 "Процессы"
 
@@ -4285,7 +4288,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"
@@ -4356,7 +4359,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"
@@ -4368,7 +4371,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 "Графики в реальном времени"
 
@@ -4376,7 +4379,7 @@ 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"
 
@@ -4515,7 +4518,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"
@@ -4563,11 +4566,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"
 
@@ -4619,7 +4622,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"
 
@@ -4649,8 +4652,8 @@ 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 "Маршруты"
 
@@ -4793,7 +4796,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 "Настройки сервера"
 
@@ -4806,7 +4809,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 "Службы"
 
@@ -4898,7 +4901,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 запроса"
 
@@ -4911,11 +4914,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 "Перейти к навигации"
 
@@ -5041,11 +5044,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 "Статические маршруты"
 
@@ -5055,7 +5058,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 "
@@ -5069,10 +5072,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 "Состояние"
 
@@ -5082,7 +5085,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 "Строгий порядок"
 
@@ -5095,11 +5098,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 "Подавить логирование стандартной работы этих протоколов"
 
@@ -5108,7 +5111,7 @@ msgid "Swap free"
 msgstr "Свободно подкачки (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 "Коммутатор"
 
@@ -5158,15 +5161,15 @@ 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
 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 "Системный журнал"
 
@@ -5182,11 +5185,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"
 
@@ -5442,7 +5445,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"
@@ -5452,9 +5456,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 "
@@ -5475,7 +5479,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 "
@@ -5521,7 +5525,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"
@@ -5598,14 +5602,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 "Трафик"
 
@@ -5837,7 +5842,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>"
 
@@ -5948,7 +5953,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 "
@@ -6005,7 +6010,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"
 
@@ -6086,10 +6091,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 "Ожидание подключения устройства..."
@@ -6129,9 +6130,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"
 
@@ -6179,7 +6180,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 +6213,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 +6239,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 +6328,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 +6389,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 +6426,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 +6513,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 +6543,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 +6556,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 +6585,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 +6645,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 +6673,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 +6721,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 16a1a1f854fc06456119674a91fddf437156421d..089f177f6cd1438bd336a65bdb18827eb17edc01 100644 (file)
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -144,15 +144,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 +162,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,7 +187,7 @@ 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 ""
 
@@ -200,28 +200,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 +337,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 +393,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 +406,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 +431,12 @@ 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
 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
@@ -447,7 +448,7 @@ msgid "Advanced Settings"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -464,17 +465,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 +499,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 +515,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 +686,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 +694,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"
@@ -799,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"
@@ -820,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)"
@@ -840,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 ""
 
@@ -1026,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 ""
 
@@ -1058,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 ""
@@ -1098,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 ""
 
@@ -1191,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 ""
 
@@ -1227,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 ""
 
@@ -1235,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 ""
 
@@ -1268,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 ""
@@ -1406,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 ""
 
@@ -1464,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 ""
 
@@ -1498,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>-"
@@ -1506,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 ""
 
@@ -1534,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 ""
 
@@ -1546,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"
@@ -1687,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 ""
 
@@ -1807,19 +1804,26 @@ 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 ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +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 ""
 
@@ -1905,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 ""
 
@@ -1932,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 ""
 
@@ -1956,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 ""
 
@@ -2084,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
@@ -2123,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 ""
@@ -2176,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
@@ -2199,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
@@ -2212,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 ""
 
@@ -2242,7 +2247,7 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2250,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 ""
@@ -2324,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
@@ -2334,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 ""
@@ -2405,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"
@@ -2496,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 ""
 
@@ -2504,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 ""
 
@@ -2556,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 ""
@@ -2621,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 ""
 
@@ -2676,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 ""
@@ -2699,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 ""
 
@@ -2776,16 +2778,20 @@ 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:36
+msgid "Lease time remaining"
+msgstr ""
+
+#: 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 +2818,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 +2846,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 +2874,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 +2894,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 +2907,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 +2939,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 +2952,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 +2984,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 +2996,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 +3093,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 ""
 
@@ -3330,11 +3332,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 +3343,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 +3409,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 ""
@@ -3456,10 +3458,10 @@ msgid "Noise:"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3503,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 +3554,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 +3729,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 +3957,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 ""
 
@@ -4002,7 +4005,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4032,7 +4035,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 +4048,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 +4105,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 +4172,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 +4182,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,7 +4190,7 @@ 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 ""
 
@@ -4320,7 +4323,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 +4369,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 +4425,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 ""
 
@@ -4452,8 +4455,8 @@ 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 ""
 
@@ -4589,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 ""
 
@@ -4602,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 ""
 
@@ -4693,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 ""
 
@@ -4706,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 ""
 
@@ -4822,11 +4825,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 +4839,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 +4850,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 +4863,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 +4876,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 +4889,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 +4937,15 @@ 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
 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 +4961,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 +5183,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 +5194,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 +5215,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 +5248,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 +5316,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 +5552,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 +5663,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 +5712,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 +5790,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 +5824,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 +5874,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 +5900,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 +5924,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 +6013,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 +6072,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 +6109,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 +6196,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 +6226,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 +6239,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 +6268,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 +6328,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 +6356,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 3060d49087d5adb46ed165df9efa5cc779d1353d..77ee27519faff9cfad2278e2fe63bdcacc8a397c 100644 (file)
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -147,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 ""
 
-#: 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 +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 "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-adress"
@@ -193,7 +193,7 @@ 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 ""
 
@@ -206,28 +206,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 +345,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 +401,7 @@ msgstr ""
 msgid "Add key"
 msgstr "Lägg till nyckel"
 
-#: 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 +414,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 +439,12 @@ 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
 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
@@ -455,7 +456,7 @@ msgid "Advanced Settings"
 msgstr "Avancerade inställningar"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -472,18 +473,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 "Alla Servrar"
 
-#: 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 +508,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 +526,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 +697,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 +705,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"
@@ -810,10 +811,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 +828,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 +848,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 +1037,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 +1070,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 +1109,7 @@ msgstr "Anslutningsförsök misslyckades"
 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 +1202,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 +1238,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 +1246,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 "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 ""
 
@@ -1282,6 +1279,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 +1418,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 "Diagnostik"
 
@@ -1480,7 +1477,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 +1511,7 @@ msgstr "Avståndsoptimering"
 msgid "Distance to farthest network member in meters."
 msgstr "Avstånd till nätverksmedlemmen 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 +1519,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 +1549,11 @@ msgstr "Vill du verkligen radera alla inställningar?"
 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 +1561,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"
@@ -1708,7 +1705,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"
 
@@ -1828,19 +1825,26 @@ 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"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 ""
 
@@ -1917,7 +1921,7 @@ msgstr ""
 msgid "Filename"
 msgstr "Filnamn"
 
-#: 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 ""
 
@@ -1926,11 +1930,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"
 
@@ -1953,7 +1957,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"
 
@@ -1977,7 +1981,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 ""
 
@@ -2105,7 +2109,7 @@ msgstr "Ogiltig Gateway-adress"
 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
@@ -2144,9 +2148,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..."
@@ -2197,6 +2201,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
@@ -2220,7 +2225,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
@@ -2233,7 +2238,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"
 
@@ -2263,7 +2268,7 @@ msgstr "IP-adress"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2271,13 +2276,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"
@@ -2345,6 +2350,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
@@ -2355,8 +2362,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"
@@ -2426,6 +2431,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"
@@ -2517,7 +2523,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>"
 
@@ -2525,7 +2531,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"
 
@@ -2577,10 +2583,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..."
@@ -2642,7 +2644,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"
 
@@ -2697,9 +2699,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!"
@@ -2720,8 +2722,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"
 
@@ -2797,20 +2799,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Återstående kontraktstid"
+
+#: 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"
-msgstr "Återstående kontraktstid"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2833,11 +2839,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 ""
 
@@ -2861,7 +2867,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"
@@ -2889,15 +2895,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 ""
 
@@ -2910,12 +2916,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"
 
@@ -2923,10 +2929,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 ""
@@ -2959,7 +2961,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"
 
@@ -2972,31 +2974,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"
 
@@ -3004,7 +3006,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 ""
 
@@ -3016,7 +3018,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"
 
@@ -3113,15 +3115,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 ""
 
@@ -3352,11 +3354,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
@@ -3364,14 +3365,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"
 
@@ -3429,13 +3431,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!"
@@ -3478,10 +3480,10 @@ msgid "Noise:"
 msgstr "Buller:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 ""
 
@@ -3523,11 +3525,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 ""
 
@@ -3574,7 +3576,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!"
 
@@ -3749,7 +3751,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"
 
@@ -3977,8 +3979,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"
 
@@ -4024,7 +4027,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4054,7 +4057,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."
 
@@ -4067,7 +4070,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"
 
@@ -4124,7 +4127,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"
@@ -4191,7 +4194,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"
@@ -4203,7 +4206,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"
 
@@ -4211,7 +4214,7 @@ 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 ""
 
@@ -4344,7 +4347,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"
@@ -4390,11 +4393,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"
 
@@ -4446,7 +4449,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"
 
@@ -4476,8 +4479,8 @@ 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"
 
@@ -4613,7 +4616,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"
 
@@ -4626,7 +4629,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"
 
@@ -4717,7 +4720,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 ""
 
@@ -4730,11 +4733,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"
 
@@ -4846,11 +4849,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"
 
@@ -4860,7 +4863,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 "
@@ -4871,10 +4874,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"
 
@@ -4884,7 +4887,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"
 
@@ -4897,11 +4900,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 ""
 
@@ -4910,7 +4913,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"
 
@@ -4958,15 +4961,15 @@ 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
 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"
 
@@ -4982,11 +4985,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"
 
@@ -5204,7 +5207,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"
@@ -5214,9 +5218,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 "
@@ -5237,7 +5241,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 "
@@ -5270,7 +5274,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"
@@ -5340,14 +5344,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"
 
@@ -5575,7 +5580,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>"
 
@@ -5686,7 +5691,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 "
@@ -5735,7 +5740,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 ""
 
@@ -5813,10 +5818,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..."
@@ -5852,9 +5853,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"
 
@@ -5902,7 +5903,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"
 
@@ -5928,9 +5929,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 +5955,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"
 
@@ -6043,13 +6044,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"
@@ -6101,7 +6103,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"
 
@@ -6138,16 +6140,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å"
@@ -6225,8 +6227,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"
@@ -6254,6 +6257,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 ""
 
@@ -6266,6 +6270,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 +6299,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 +6359,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 +6387,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 +6435,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 7e6f95a23d8697103bbab9fa69fdefa8583f7016..2f7c0d2776ea2e3fdb593ed0bcc328a081f0f880 100644 (file)
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -136,15 +136,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 +154,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,7 +179,7 @@ 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 ""
 
@@ -192,28 +192,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 +329,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 +385,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 +398,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 +423,12 @@ 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
 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
@@ -439,7 +440,7 @@ msgid "Advanced Settings"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -456,17 +457,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 +491,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 +507,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 +678,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 +686,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,10 +792,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 +809,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 +829,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 +1015,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 +1048,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 +1087,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 +1180,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 +1216,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 +1224,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 +1257,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 +1396,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 +1453,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 +1487,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 +1495,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 +1523,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 +1535,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 +1676,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,19 +1796,26 @@ 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 ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1892,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 +1901,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 +1928,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 +1952,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 +2080,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 +2119,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 +2172,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 +2196,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 +2209,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 ""
 
@@ -2234,7 +2239,7 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2242,13 +2247,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 +2321,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 +2333,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 +2402,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 +2494,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 +2502,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 +2554,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 +2615,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 +2670,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 +2693,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 +2770,20 @@ 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:36
+msgid "Lease time remaining"
+msgstr ""
+
+#: 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 +2810,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 +2838,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 +2866,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 +2886,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 +2899,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 +2931,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 +2944,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 +2976,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 +2988,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 +3085,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 ""
 
@@ -3322,11 +3324,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 +3335,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 +3401,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 ""
@@ -3448,10 +3450,10 @@ msgid "Noise:"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3495,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 +3546,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 +3721,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 +3949,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 ""
 
@@ -3994,7 +3997,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4024,7 +4027,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 +4040,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 +4097,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 +4164,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 +4174,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,7 +4182,7 @@ 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 ""
 
@@ -4312,7 +4315,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 +4361,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 +4417,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 ""
 
@@ -4444,8 +4447,8 @@ 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 ""
 
@@ -4581,7 +4584,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 +4597,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 +4688,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 +4701,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,11 +4817,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 +4831,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 +4842,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 +4855,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 +4868,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 +4881,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 +4929,15 @@ 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
 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 +4953,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 +5175,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 +5186,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 +5207,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 +5240,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 +5308,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 +5544,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 +5655,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 +5704,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 +5782,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 +5816,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 +5866,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 +5892,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 +5916,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 +6005,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 +6064,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 +6101,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 +6188,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 +6218,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 +6231,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 +6260,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 +6320,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 +6348,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 329357ae14e3efd3b8c5554757f9f0ca61c9dbd1..457ed5aacbd33387f8e157dbbd93080735cbcf5a 100644 (file)
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -151,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 "<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 +169,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,7 +196,7 @@ 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 ""
 
@@ -209,16 +209,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 +226,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 +234,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 +353,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 +410,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 +423,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 +448,12 @@ 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
 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,7 +465,7 @@ msgid "Advanced Settings"
 msgstr "Gelişmiş Ayarlar"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -481,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 ""
 
@@ -518,7 +519,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 +537,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 +708,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 +716,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"
@@ -821,10 +822,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 +839,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 +859,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 +1047,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 +1080,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 +1119,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 +1212,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 +1248,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 +1256,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 +1289,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 +1428,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 +1487,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 +1521,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 +1529,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 +1557,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 +1569,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 +1710,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,19 +1830,26 @@ 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 ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1926,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 +1935,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 +1962,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 +1986,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 +2114,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 +2153,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 +2206,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 +2230,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 +2243,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 ""
 
@@ -2268,7 +2273,7 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2276,13 +2281,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 +2355,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 +2367,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 +2436,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 +2528,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 +2536,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 +2588,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 +2649,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 +2704,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 +2727,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,20 +2804,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Kalan kira süresi"
+
+#: 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"
-msgstr "Kalan kira süresi"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2838,11 +2844,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 +2872,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 +2900,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 +2920,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 +2933,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 +2965,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 +2978,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 +3010,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 +3022,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 +3119,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 ""
 
@@ -3356,11 +3358,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 +3369,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 +3435,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 ""
@@ -3482,10 +3484,10 @@ msgid "Noise:"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3529,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 +3580,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 +3755,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 +3983,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 ""
 
@@ -4028,7 +4031,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4058,7 +4061,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 +4074,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 +4131,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 +4198,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 +4208,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,7 +4216,7 @@ 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 ""
 
@@ -4346,7 +4349,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 +4395,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 +4451,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 ""
 
@@ -4478,8 +4481,8 @@ 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"
 
@@ -4616,7 +4619,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 +4632,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 +4723,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 +4736,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 ""
 
@@ -4849,11 +4852,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 +4866,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 +4877,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 +4890,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 +4903,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 +4916,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 +4964,15 @@ 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
 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 +4988,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 +5210,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 +5221,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 +5242,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 +5275,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 +5343,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 +5579,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 +5690,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 +5739,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 +5817,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 +5851,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 +5901,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 +5927,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 +5953,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 +6042,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 +6101,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 +6138,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 +6225,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 +6255,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 +6268,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 +6297,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 +6357,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 +6385,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 +6433,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 31191bdada0af00399d912053894d380b973cbc9..0be8ca574dbb16a130a29124e2e76a4d8af99ee7 100644 (file)
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -152,19 +152,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 +178,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,7 +205,7 @@ 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)"
 
@@ -219,18 +219,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 +238,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 +247,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 +376,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 +432,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 +445,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 +470,12 @@ 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
 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
@@ -486,7 +487,7 @@ msgid "Advanced Settings"
 msgstr "Додаткові параметри"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr "Сукупна потужність передавача"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -503,17 +504,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 +543,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 +561,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 +744,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 +752,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"
@@ -858,10 +859,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 +879,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 +901,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 +1100,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 +1137,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 +1176,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 +1278,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 +1314,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 +1322,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 +1357,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 +1499,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 +1558,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 +1592,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 +1605,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 +1637,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 +1649,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 +1803,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,19 +1926,26 @@ 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 "Розширення вузлів"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +2022,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 +2031,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 +2060,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 +2084,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 +2214,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 +2253,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 +2312,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 +2336,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 +2349,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 "Імена вузлів"
 
@@ -2374,7 +2379,7 @@ msgstr "IP-адреса"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr "Неприпустима IP-адреса"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2382,13 +2387,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 +2461,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 +2473,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 +2544,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 +2646,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 +2654,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 +2709,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 +2770,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 +2830,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 +2853,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,20 +2930,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Час оренди, що лишився"
+
+#: 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"
-msgstr "Час оренди, що лишився"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2964,12 +2970,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 +3000,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 +3046,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 +3068,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 +3081,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 +3113,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 +3126,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 +3139,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 +3157,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 +3165,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 +3177,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 +3278,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"
 
@@ -3517,11 +3519,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 +3530,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 +3596,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 "Пароль не встановлено!"
@@ -3643,10 +3645,10 @@ msgid "Noise:"
 msgstr "Шум:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3690,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 +3741,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 +3934,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 +4164,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 "Ехо-запит"
 
@@ -4209,7 +4212,7 @@ msgid "Power Management Mode"
 msgstr "Режим керування живленням"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr "Попереджувати помилки CRC (CRCP_P)"
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4241,7 +4244,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 +4257,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 +4318,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 +4389,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 +4402,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,7 +4410,7 @@ 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 "Захист від переприв'язки"
 
@@ -4545,7 +4548,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 +4596,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 +4652,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"
 
@@ -4679,8 +4682,8 @@ 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 "Маршрути"
 
@@ -4823,7 +4826,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 +4839,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 +4934,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 +4947,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 "Перейти до навігації"
 
@@ -5074,11 +5077,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 +5091,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 +5106,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 +5119,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 +5132,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 +5145,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 +5195,15 @@ 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
 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 +5219,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 +5483,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 +5494,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 +5517,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 +5562,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 +5642,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 +5883,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 +5994,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 +6053,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 +6133,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 +6171,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 +6221,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 +6253,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 +6279,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 +6368,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 +6429,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 +6468,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 +6555,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 +6585,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 +6598,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 +6627,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 +6687,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 +6715,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 +6763,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 93185e0817c70aabed62c3a95bd8ed0fb4724f21..d9c2bddc0fc0776b12d75f661953f086c02cf1ab 100644 (file)
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -149,15 +149,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 +169,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,7 +196,7 @@ 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)"
@@ -210,17 +210,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 +228,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 +236,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 +361,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 +417,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 +430,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 +455,12 @@ 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
 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
@@ -471,7 +472,7 @@ msgid "Advanced Settings"
 msgstr "Cài đặt nâng cao "
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr "Năng lượng truyền tổng hợp(ACTATP)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -488,17 +489,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 +523,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 +539,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 +719,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 +727,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"
@@ -832,10 +833,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 +853,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 +875,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 +1067,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 +1104,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 +1143,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 +1243,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 +1279,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 +1287,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 +1320,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 +1459,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 +1518,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 +1552,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 +1564,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 +1593,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 +1605,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 +1757,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,19 +1878,26 @@ 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ủ"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1974,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 +1983,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 +2012,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 +2036,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 +2167,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 +2206,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 +2261,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 +2285,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 +2298,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ủ"
 
@@ -2323,7 +2328,7 @@ msgstr "Địa chỉ IP"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr "Địa chỉ IP không hợp lệ"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2331,13 +2336,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 +2410,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 +2422,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 +2491,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 +2592,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 +2600,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 +2654,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 +2715,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 +2775,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 +2798,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,20 +2875,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "Leasetime còn lại"
+
+#: 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"
-msgstr "Leasetime còn lại"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2909,13 +2915,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 +2945,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 +2983,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 +3003,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 +3016,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 +3048,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 +3061,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 +3073,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 +3096,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 +3108,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 +3207,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"
 
@@ -3446,11 +3448,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 +3459,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 +3525,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!"
@@ -3572,10 +3574,10 @@ msgid "Noise:"
 msgstr "Nhiễu:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3619,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 +3672,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 +3862,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 +4090,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 ""
 
@@ -4135,7 +4138,7 @@ msgid "Power Management Mode"
 msgstr "Chế độ kiểm soát năng lượng"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr "Lỗi CRC ưu tiên (CRCP_P)"
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4167,7 +4170,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 +4183,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 +4245,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 +4316,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 +4328,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,7 +4336,7 @@ 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"
 
@@ -4473,7 +4476,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 +4524,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 +4580,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"
 
@@ -4607,8 +4610,8 @@ 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"
 
@@ -4749,7 +4752,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 +4765,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 +4859,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 +4872,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"
 
@@ -4995,11 +4998,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 +5012,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 +5027,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 +5040,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 +5053,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 +5066,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 +5116,15 @@ 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
 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 +5140,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 +5393,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 +5404,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 +5427,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 +5472,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 +5548,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 +5788,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 +5899,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 +5955,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 +6035,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 +6072,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 +6122,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 +6154,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 +6180,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 +6270,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 +6331,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 +6368,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 +6455,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 +6485,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 +6498,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 +6527,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 +6587,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 +6615,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 +6663,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 55f143582708b0f883ade207bed6c85e1c412a1f..b28172028ba41d5d6d14f5b9f7b1b7cd050eb438 100644 (file)
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -149,15 +149,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 +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> 地址"
@@ -195,7 +195,7 @@ 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> 后缀（十六进制）"
@@ -209,16 +209,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 +226,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 +234,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 +353,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 +409,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 +422,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 +447,12 @@ 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
 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
@@ -463,7 +464,7 @@ msgid "Advanced Settings"
 msgstr "高级设置"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr "总发射功率（ACTATP）"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -480,17 +481,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 +515,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 +531,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 +703,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 +711,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,10 +817,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 +836,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 +856,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 +1046,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 +1082,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 +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 "连接"
 
@@ -1220,8 +1217,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 +1253,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 +1261,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 +1294,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 +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 "网络诊断"
 
@@ -1497,7 +1494,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 +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>-"
@@ -1542,15 +1539,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 +1567,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 +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"
@@ -1728,7 +1725,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,19 +1845,26 @@ 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 文件中的主机后缀"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +1941,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 +1950,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 +1977,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 +2001,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 +2131,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 +2170,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 +2223,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 +2247,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 +2260,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 "主机映射"
 
@@ -2285,7 +2290,7 @@ msgstr "IP 地址"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr "IP 地址无效"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2293,13 +2298,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 +2372,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 +2384,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 +2453,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 +2549,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 +2557,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 +2611,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 +2672,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 +2727,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 +2750,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,20 +2827,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "剩余租期"
+
+#: 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"
-msgstr "剩余租期"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2861,11 +2867,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 +2895,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 +2931,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 +2951,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 +2964,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 +2996,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 +3009,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 +3041,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 +3053,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 +3150,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 数据包大小"
 
@@ -3387,11 +3389,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 +3400,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 +3466,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 "未设置密码！"
@@ -3513,10 +3515,10 @@ msgid "Noise:"
 msgstr "噪声："
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3560,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 +3611,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 +3792,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 +4020,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"
 
@@ -4065,7 +4068,7 @@ msgid "Power Management Mode"
 msgstr "电源管理模式"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr "抢占式 CRC 错误（CRCP_P）"
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4095,7 +4098,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 +4111,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 +4170,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 +4238,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 +4250,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,7 +4258,7 @@ 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 "重绑定保护"
 
@@ -4392,7 +4395,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 +4441,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 +4497,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 服务器的根目录"
 
@@ -4524,8 +4527,8 @@ 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 "路由表"
 
@@ -4663,7 +4666,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 +4679,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 +4772,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 +4785,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 "跳转到导航"
 
@@ -4902,11 +4905,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 +4919,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 +4932,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 +4945,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 +4958,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 +4971,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 +5019,15 @@ 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
 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 +5043,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 +5284,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 +5295,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 +5316,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 +5355,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 +5427,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 +5665,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 +5776,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 +5831,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 +5911,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 +5947,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 +5997,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 +6025,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 +6049,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 +6138,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 +6199,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 +6236,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 +6323,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 +6353,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 +6366,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 +6395,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 +6455,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 +6483,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 +6531,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 e0f2b34c2402bde5d5ee5d3afc297a5bd42415ab..288b0e76ec47fae7eb3c25443731fa5de63b1fcb 100644 (file)
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -147,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> 查詢通訊埠"
 
-#: 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 +165,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,7 +191,7 @@ 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 ""
 
@@ -204,16 +204,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 +221,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 +229,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 +347,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 +403,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 +416,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 +441,12 @@ 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
 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
@@ -457,7 +458,7 @@ msgid "Advanced Settings"
 msgstr "進階設定"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -474,17 +475,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 +509,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 +525,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 +696,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 +704,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"
@@ -809,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"
@@ -832,7 +829,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 +849,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 +1039,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 +1072,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 +1111,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 +1208,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 +1244,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 +1252,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 +1285,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 +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 "診斷"
 
@@ -1487,7 +1484,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 +1518,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 +1529,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 +1557,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 +1569,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 +1714,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,19 +1834,26 @@ 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 "延伸主機"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a 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 +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 "開機影像檔通知給用戶端"
 
@@ -1936,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 "無用過濾器"
 
@@ -1963,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 "防火牆"
 
@@ -1987,7 +1991,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 +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
@@ -2154,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 "前往密碼設定頁"
@@ -2207,6 +2211,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 +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
@@ -2243,7 +2248,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 "主機名稱"
 
@@ -2273,7 +2278,7 @@ msgstr "IP位址"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr "IP位址不正確"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2281,13 +2286,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 +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
@@ -2365,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 "IPv6版"
@@ -2436,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"
@@ -2531,7 +2537,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 +2545,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 +2597,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 +2658,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 +2714,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 +2737,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,20 +2814,24 @@ 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:36
+msgid "Lease time remaining"
+msgstr "租賃保留時間"
+
+#: 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"
-msgstr "租賃保留時間"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -2848,11 +2854,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 +2882,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 +2910,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 +2930,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 +2943,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 +2975,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 +2988,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 +3021,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 +3033,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 +3130,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封包最大數量"
 
@@ -3367,11 +3369,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 +3380,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 +3446,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 "尚未設定密碼!"
@@ -3493,10 +3495,10 @@ msgid "Noise:"
 msgstr "雜訊比:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive 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 +3540,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 +3591,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 +3766,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 +3994,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"
 
@@ -4039,7 +4042,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4069,7 +4072,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 +4085,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 +4142,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 +4209,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 +4221,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,7 +4229,7 @@ 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 "重新綁護"
 
@@ -4359,7 +4362,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 +4408,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 +4464,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存取根目錄檔案"
 
@@ -4491,8 +4494,8 @@ 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 "路由"
 
@@ -4628,7 +4631,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 +4644,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 +4735,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 +4748,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 "跳到導覽"
 
@@ -4863,11 +4866,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 +4880,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 +4893,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 +4906,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 +4919,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 +4932,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 +4980,15 @@ 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
 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 +5004,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 +5238,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 +5249,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 +5270,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 +5307,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 +5379,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 +5615,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 +5726,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 +5778,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 +5858,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 +5892,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 +5942,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 +5970,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 +5994,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 +6083,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 +6144,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 +6181,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 +6268,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 +6298,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 +6311,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 +6340,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 +6400,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 +6428,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 +6476,15 @@ msgstr "是的"
 msgid "« Back"
 msgstr "« 倒退"
 
+#~ msgid "Bad address specified!"
+#~ msgstr "指定了錯誤的位置！"
+
+#~ msgid "Loading"
+#~ msgstr "讀取中"
+
+#~ msgid "Waiting for command to complete..."
+#~ msgstr "等待完整性指令..."
+
 #~ msgid "Assign interfaces..."
 #~ msgstr "分配界面..."
 

diff --git a/modules/luci-base/root/usr/share/luci/menu.d/luci-base.json b/modules/luci-base/root/usr/share/luci/menu.d/luci-base.json
new file mode 100644 (file)
index 0000000..cdfffb5
--- /dev/null
+++ b/modules/luci-base/root/usr/share/luci/menu.d/luci-base.json
@@ -0,0 +1,142 @@
+{
+       "admin": {
+               "title": "Administration",
+               "order": 10,
+               "action": {
+                       "type": "firstchild",
+                       "recurse": true
+               },
+               "auth": {
+                       "methods": [ "cookie:sysauth" ],
+                       "login": true
+               }
+       },
+
+       "admin/status": {
+               "title": "Status",
+               "order": 10,
+               "action": {
+                       "type": "firstchild",
+                       "preferred": "overview",
+                       "recurse": true
+               }
+       },
+
+       "admin/system": {
+               "title": "System",
+               "order": 20,
+               "action": {
+                       "type": "firstchild",
+                       "preferred": "system",
+                       "recurse": true
+               }
+       },
+
+       "admin/vpn": {
+               "title": "VPN",
+               "order": 30,
+               "action": {
+                       "type": "firstchild",
+                       "recurse": true
+               }
+       },
+
+       "admin/services": {
+               "title": "Services",
+               "order": 40,
+               "action": {
+                       "type": "firstchild",
+                       "recurse": true
+               }
+       },
+
+       "admin/network": {
+               "title": "Network",
+               "order": 50,
+               "action": {
+                       "type": "firstchild",
+                       "recurse": true
+               }
+       },
+
+       "admin/translations/*": {
+               "action": {
+                       "type": "call",
+                       "module": "luci.controller.admin.index",
+                       "function": "action_translations"
+               },
+               "auth": {
+                       "methods": [ "cookie:sysauth" ]
+               }
+       },
+
+       "admin/ubus/*": {
+               "action": {
+                       "type": "call",
+                       "module": "luci.controller.admin.index",
+                       "function": "action_ubus"
+               },
+               "auth": {}
+       },
+
+       "admin/logout": {
+               "title": "Logout",
+               "order": 999,
+               "action": {
+                       "type": "call",
+                       "module": "luci.controller.admin.index",
+                       "function": "action_logout"
+               }
+       },
+
+       "admin/uci": {
+               "action": {
+                       "type": "firstchild"
+               }
+       },
+
+       "admin/uci/revert": {
+               "action": {
+                       "type": "call",
+                       "module": "luci.controller.admin.uci",
+                       "function": "action_revert",
+                       "post": true
+               }
+       },
+
+       "admin/uci/apply_rollback": {
+               "cors": true,
+               "action": {
+                       "type": "call",
+                       "module": "luci.controller.admin.uci",
+                       "function": "action_apply_rollback",
+                       "post": true
+               },
+               "auth": {
+                       "methods": [ "cookie:sysauth" ]
+               }
+       },
+
+       "admin/uci/apply_unchecked": {
+               "cors": true,
+               "action": {
+                       "type": "call",
+                       "module": "luci.controller.admin.uci",
+                       "function": "action_apply_unchecked",
+                       "post": true
+               },
+               "auth": {
+                       "methods": [ "cookie:sysauth" ]
+               }
+       },
+
+       "admin/uci/confirm": {
+               "cors": true,
+               "action": {
+                       "type": "call",
+                       "module": "luci.controller.admin.uci",
+                       "function": "action_confirm"
+               },
+               "auth": {}
+       }
+}

diff --git a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json
index 50ddc299faf71627397c7ac6fec4632800505b20..1f5b26f8d659438c746ef69a76b662aa2ab7de71 100644 (file)
--- a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json
+++ b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json
@@ -20,7 +20,7 @@
        "luci-access": {
                "description": "Grant access to basic LuCI procedures",
                "read": {
-                       "cgi-io": [ "backup", "download" ],
+                       "cgi-io": [ "backup", "download", "exec" ],
                        "file": {
                                "/": [ "list" ],
                                "/*": [ "list" ],
@@ -38,7 +38,25 @@
                                "/proc/sys/kernel/hostname": [ "read" ],
                                "/proc/sys/net/netfilter/nf_conntrack_*": [ "read" ],
                                "/proc/mounts": [ "read" ],
-                               "/usr/lib/lua/luci/version.lua": [ "read" ]
+                               "/usr/lib/lua/luci/version.lua": [ "read" ],
+                               "/bin/dmesg -r": [ "exec" ],
+                               "/bin/ping *": [ "exec" ],
+                               "/bin/ping6 *": [ "exec" ],
+                               "/bin/traceroute *": [ "exec" ],
+                               "/bin/traceroute6 *": [ "exec" ],
+                               "/sbin/ip -4 neigh show": [ "exec" ],
+                               "/sbin/ip -4 route show table all": [ "exec" ],
+                               "/sbin/ip -6 neigh show": [ "exec" ],
+                               "/sbin/ip -6 route show table all": [ "exec" ],
+                               "/sbin/logread -e ^": [ "exec" ],
+                               "/usr/bin/ping *": [ "exec" ],
+                               "/usr/bin/ping6 *": [ "exec" ],
+                               "/usr/bin/traceroute *": [ "exec" ],
+                               "/usr/bin/traceroute6 *": [ "exec" ],
+                               "/usr/bin/nslookup *": [ "exec" ],
+                               "/usr/libexec/luci-peeraddr": [ "exec" ],
+                               "/usr/sbin/iptables --line-numbers -w -nvxL -t *": [ "exec" ],
+                               "/usr/sbin/ip6tables --line-numbers -w -nvxL -t *": [ "exec" ]
                        },
                        "ubus": {
                                "file": [ "list", "read", "stat" ],
@@ -58,6 +76,7 @@
                        "file": {
                                "/etc/crontabs/root": [ "write" ],
                                "/etc/dropbear/authorized_keys": [ "write" ],
+                               "/etc/init.d/firewall restart": [ "exec" ],
                                "/etc/luci-uploads/*": [ "write" ],
                                "/etc/rc.local": [ "write" ],
                                "/etc/sysupgrade.conf": [ "write" ],
@@ -73,7 +92,9 @@
                                "/bin/umount": [ "exec" ],
                                "/tmp/backup.tar.gz": [ "write" ],
                                "/tmp/firmware.bin": [ "write" ],
-                               "/tmp/upload.ipk": [ "write" ]
+                               "/tmp/upload.ipk": [ "write" ],
+                               "/usr/sbin/iptables -Z": [ "exec" ],
+                               "/usr/sbin/ip6tables -Z": [ "exec" ]
                        },
                        "ubus": {
                                "file": [ "write", "remove", "exec" ],

diff --git a/modules/luci-compat/luasrc/model/network.lua b/modules/luci-compat/luasrc/model/network.lua
index 7c88b428cc7b321106d04499630171809b05a857..b9ef19b1710d0bac9500e2ddc019ce3a34ea8b61 100644 (file)
--- a/modules/luci-compat/luasrc/model/network.lua
+++ b/modules/luci-compat/luasrc/model/network.lua
@@ -25,7 +25,7 @@ IFACE_PATTERNS_WIRELESS = { "^wlan%d", "^wl%d", "^ath%d", "^%w+%.network%d" }
 
 IFACE_ERRORS = {
        CONNECT_FAILED                  = lng.translate("Connection attempt failed"),
-       INVALID_ADDRESS                 = lng.translate("IP address in invalid"),
+       INVALID_ADDRESS                 = lng.translate("IP address is invalid"),
        INVALID_GATEWAY                 = lng.translate("Gateway address is invalid"),
        INVALID_LOCAL_ADDRESS   = lng.translate("Local IP address is invalid"),
        MISSING_ADDRESS                 = lng.translate("IP address is missing"),
@@ -371,6 +371,7 @@ function init(cursor)
                                        b.ifnames[1].bridge = b
                                end
                                _bridge[r[1]] = b
+                               _interfaces[r[1]].bridge = b
                        elseif b then
                                b.ifnames[#b.ifnames+1] = _interfaces[r[2]]
                                b.ifnames[#b.ifnames].bridge = b
@@ -1447,20 +1448,21 @@ function interface.ports(self)
                for _, iface in ipairs(members) do
                        ifaces[#ifaces+1] = interface(iface)
                end
+               return ifaces
        end
 end
 
 function interface.bridge_id(self)
-       if self.br then
-               return self.br.id
+       if self.dev and self.dev.bridge then
+               return self.dev.bridge.id
        else
                return nil
        end
 end
 
 function interface.bridge_stp(self)
-       if self.br then
-               return self.br.stp
+       if self.dev and self.dev.bridge then
+               return self.dev.bridge.stp
        else
                return false
        end
@@ -1479,7 +1481,8 @@ function interface.is_bridge(self)
 end
 
 function interface.is_bridgeport(self)
-       return self.dev and self.dev.bridge and true or false
+       return self.dev and self.dev.bridge and
+              (self.dev.bridge.name ~= self:name()) and true or false
 end
 
 function interface.tx_bytes(self)

diff --git a/modules/luci-compat/luasrc/tools/webadmin.lua b/modules/luci-compat/luasrc/tools/webadmin.lua
new file mode 100644 (file)
index 0000000..106810a
--- /dev/null
+++ b/modules/luci-compat/luasrc/tools/webadmin.lua
@@ -0,0 +1,105 @@
+-- Copyright 2008 Steven Barth <steven@midlink.org>
+-- Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org>
+-- Licensed to the public under the Apache License 2.0.
+
+module("luci.tools.webadmin", package.seeall)
+
+local util = require "luci.util"
+local uci  = require "luci.model.uci"
+local ip   = require "luci.ip"
+
+function byte_format(byte)
+       local suff = {"B", "KB", "MB", "GB", "TB"}
+       for i=1, 5 do
+               if byte > 1024 and i < 5 then
+                       byte = byte / 1024
+               else
+                       return string.format("%.2f %s", byte, suff[i]) 
+               end 
+       end
+end
+
+function date_format(secs)
+       local suff = {"min", "h", "d"}
+       local mins = 0
+       local hour = 0
+       local days = 0
+       
+       secs = math.floor(secs)
+       if secs > 60 then
+               mins = math.floor(secs / 60)
+               secs = secs % 60
+       end
+       
+       if mins > 60 then
+               hour = math.floor(mins / 60)
+               mins = mins % 60
+       end
+       
+       if hour > 24 then
+               days = math.floor(hour / 24)
+               hour = hour % 24
+       end
+       
+       if days > 0 then
+               return string.format("%.0fd %02.0fh %02.0fmin %02.0fs", days, hour, mins, secs)
+       else
+               return string.format("%02.0fh %02.0fmin %02.0fs", hour, mins, secs)
+       end
+end
+
+function cbi_add_networks(field)
+       uci.cursor():foreach("network", "interface",
+               function (section)
+                       if section[".name"] ~= "loopback" then
+                               field:value(section[".name"])
+                       end
+               end
+       )
+       field.titleref = luci.dispatcher.build_url("admin", "network", "network")
+end
+
+function cbi_add_knownips(field)
+       local _, n
+       for _, n in ipairs(ip.neighbors({ family = 4 })) do
+               if n.dest then
+                       field:value(n.dest:string())
+               end
+       end
+end
+
+function firewall_find_zone(name)
+       local find
+       
+       luci.model.uci.cursor():foreach("firewall", "zone", 
+               function (section)
+                       if section.name == name then
+                               find = section[".name"]
+                       end
+               end
+       )
+       
+       return find
+end
+
+function iface_get_network(iface)
+       local link = ip.link(tostring(iface))
+       if link.master then
+               iface = link.master
+       end
+
+       local cur = uci.cursor()
+       local dump = util.ubus("network.interface", "dump", { })
+       if dump then
+               local _, net
+               for _, net in ipairs(dump.interface) do
+                       if net.l3_device == iface or net.device == iface then
+                               -- cross check with uci to filter out @name style aliases
+                               local uciname = cur:get("network", net.interface, "ifname")
+                               if type(uciname) == "string" and uciname:sub(1,1) ~= "@" or uciname then
+                                       return net.interface
+                               end
+                       end
+               end
+       end
+end

diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua
index bcc26cd442109347d579bc70de9b1165d577b1d3..8841d1ff8253e1792e6f445be3fa8bd64ed8534a 100644 (file)
--- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua
@@ -71,7 +71,7 @@ if leases then
        end
        ip = v:option(DummyValue, 3, translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
        mac  = v:option(DummyValue, 2, translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
-       ltime = v:option(DummyValue, 1, translate("Leasetime remaining"))
+       ltime = v:option(DummyValue, 1, translate("Lease time remaining"))
        function ltime.cfgvalue(self, ...)
                local value = DummyValue.cfgvalue(self, ...)
                return wa.date_format(os.difftime(tonumber(value), os.time()))

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
index ab6779e1493819b0ec9913e3af3697fee205038b..c4db638b11296d8eb4366b9a159ba3fe0cbd59cb 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
@@ -2,8 +2,9 @@
 'require rpc';
 'require uci';
 'require form';
+'require validation';
 
-var callHostHints, callDUIDHints, callDHCPLeases, CBILeaseStatus;
+var callHostHints, callDUIDHints, callDHCPLeases, CBILeaseStatus, CBILease6Status;
 
 callHostHints = rpc.declare({
        object: 'luci-rpc',
@@ -20,8 +21,7 @@ callDUIDHints = rpc.declare({
 callDHCPLeases = rpc.declare({
        object: 'luci-rpc',
        method: 'getDHCPLeases',
-       params: [ 'family' ],
-       expect: { dhcp_leases: [] }
+       expect: { '': {} }
 });
 
 CBILeaseStatus = form.DummyValue.extend({
@@ -33,7 +33,26 @@ CBILeaseStatus = form.DummyValue.extend({
                                        E('div', { 'class': 'th' }, _('Hostname')),
                                        E('div', { 'class': 'th' }, _('IPv4-Address')),
                                        E('div', { 'class': 'th' }, _('MAC-Address')),
-                                       E('div', { 'class': 'th' }, _('Leasetime remaining'))
+                                       E('div', { 'class': 'th' }, _('Lease time remaining'))
+                               ]),
+                               E('div', { 'class': 'tr placeholder' }, [
+                                       E('div', { 'class': 'td' }, E('em', _('Collecting data...')))
+                               ])
+                       ])
+               ]);
+       }
+});
+
+CBILease6Status = form.DummyValue.extend({
+       renderWidget: function(section_id, option_id, cfgvalue) {
+               return E([
+                       E('h4', _('Active DHCPv6 Leases')),
+                       E('div', { 'id': 'lease6_status_table', 'class': 'table' }, [
+                               E('div', { 'class': 'tr table-titles' }, [
+                                       E('div', { 'class': 'th' }, _('Host')),
+                                       E('div', { 'class': 'th' }, _('IPv6-Address')),
+                                       E('div', { 'class': 'th' }, _('DUID')),
+                                       E('div', { 'class': 'th' }, _('Lease time remaining'))
                                ]),
                                E('div', { 'class': 'tr placeholder' }, [
                                        E('div', { 'class': 'td' }, E('em', _('Collecting data...')))
@@ -43,6 +62,67 @@ CBILeaseStatus = form.DummyValue.extend({
        }
 });
 
+function validateHostname(sid, s) {
+       if (s.length > 256)
+               return _('Expecting: %s').format(_('valid hostname'));
+
+       var labels = s.replace(/^\.+|\.$/g, '').split(/\./);
+
+       for (var i = 0; i < labels.length; i++)
+               if (!labels[i].match(/^[a-z0-9_](?:[a-z0-9-]{0,61}[a-z0-9])?$/i))
+                       return _('Expecting: %s').format(_('valid hostname'));
+
+       return true;
+}
+
+function validateAddressList(sid, s) {
+       if (s == null || s == '')
+               return true;
+
+       var m = s.match(/^\/(.+)\/$/),
+           names = m ? m[1].split(/\//) : [ s ];
+
+       for (var i = 0; i < names.length; i++) {
+               var res = validateHostname(sid, names[i]);
+
+               if (res !== true)
+                       return res;
+       }
+
+       return true;
+}
+
+function validateServerSpec(sid, s) {
+       if (s == null || s == '')
+               return true;
+
+       var m = s.match(/^\/(.+)\/(.*)$/);
+       if (!m)
+               return _('Expecting: %s').format(_('valid hostname'));
+
+       var res = validateAddressList(sid, m[1]);
+       if (res !== true)
+               return res;
+
+       if (m[2] == '' || m[2] == '#')
+               return true;
+
+       // ipaddr%scopeid#srvport@source@interface#srcport
+
+       m = m[2].match(/^([0-9a-f:.]+)(?:%[^#@]+)?(?:#(\d+))?(?:@([0-9a-f:.]+)(?:@[^#]+)?(?:#(\d+))?)?$/);
+
+       if (!m)
+               return _('Expecting: %s').format(_('valid IP address'));
+       else if (validation.parseIPv4(m[1]) && m[3] != null && !validation.parseIPv4(m[3]))
+               return _('Expecting: %s').format(_('valid IPv4 address'));
+       else if (validation.parseIPv6(m[1]) && m[3] != null && !validation.parseIPv6(m[3]))
+               return _('Expecting: %s').format(_('valid IPv6 address'));
+       else if ((m[2] != null && +m[2] > 65535) || (m[4] != null && +m[4] > 65535))
+               return _('Expecting: %s').format(_('valid port value'));
+
+       return true;
+}
+
 return L.view.extend({
        load: function() {
                return Promise.all([
@@ -52,7 +132,8 @@ return L.view.extend({
        },
 
        render: function(hosts_duids) {
-               var hosts = hosts_duids[0],
+               var has_dhcpv6 = L.hasSystemFeature('dnsmasq', 'dhcpv6') || L.hasSystemFeature('odhcpd'),
+                   hosts = hosts_duids[0],
                    duids = hosts_duids[1],
                    m, s, o, ss, so;
 
@@ -182,6 +263,7 @@ return L.view.extend({
 
                o.optional = true;
                o.placeholder = '/example.org/10.1.2.3';
+               o.validate = validateServerSpec;
 
 
                o = s.taboption('general', form.Flag, 'rebind_protection',
@@ -204,8 +286,8 @@ return L.view.extend({
                o.optional = true;
 
                o.depends('rebind_protection', '1');
-               o.datatype = 'host(1)';
                o.placeholder = 'ihost.netflix.com';
+               o.validate = validateAddressList;
 
 
                o = s.taboption('advanced', form.Value, 'port',
@@ -288,6 +370,7 @@ return L.view.extend({
                o = s.taboption('general', form.Flag, 'nonwildcard',
                        _('Non-wildcard'),
                        _('Bind dynamically to interfaces rather than wildcard address (recommended as linux default)'));
+               o.default = o.enabled;
                o.optional = false;
                o.rmempty = true;
 
@@ -399,9 +482,15 @@ return L.view.extend({
 
                o = s.taboption('leases', CBILeaseStatus, '__status__');
 
+               if (has_dhcpv6)
+                       o = s.taboption('leases', CBILease6Status, '__status6__');
+
                return m.render().then(function(mapEl) {
                        L.Poll.add(function() {
-                               return callDHCPLeases(4).then(function(leases) {
+                               return callDHCPLeases().then(function(leaseinfo) {
+                                       var leases = Array.isArray(leaseinfo.dhcp_leases) ? leaseinfo.dhcp_leases : [],
+                                           leases6 = Array.isArray(leaseinfo.dhcp6_leases) ? leaseinfo.dhcp6_leases : [];
+
                                        cbi_update_table(mapEl.querySelector('#lease_status_table'),
                                                leases.map(function(lease) {
                                                        var exp;
@@ -421,6 +510,39 @@ return L.view.extend({
                                                        ];
                                                }),
                                                E('em', _('There are no active leases')));
+
+                                       if (has_dhcpv6) {
+                                               cbi_update_table(mapEl.querySelector('#lease6_status_table'),
+                                                       leases6.map(function(lease) {
+                                                               var exp;
+
+                                                               if (lease.expires === false)
+                                                                       exp = E('em', _('unlimited'));
+                                                               else if (lease.expires <= 0)
+                                                                       exp = E('em', _('expired'));
+                                                               else
+                                                                       exp = '%t'.format(lease.expires);
+
+                                                               var hint = lease.macaddr ? hosts[lease.macaddr] : null,
+                                                                   name = hint ? (hint.name || hint.ipv4 || hint.ipv6) : null,
+                                                                   host = null;
+
+                                                               if (name && lease.hostname && lease.hostname != name && lease.ip6addr != name)
+                                                                       host = '%s (%s)'.format(lease.hostname, name);
+                                                               else if (lease.hostname)
+                                                                       host = lease.hostname;
+                                                               else if (name)
+                                                                       host = name;
+
+                                                               return [
+                                                                       host || '-',
+                                                                       lease.ip6addrs ? lease.ip6addrs.join(' ') : lease.ip6addr,
+                                                                       lease.duid,
+                                                                       exp
+                                                               ];
+                                                       }),
+                                                       E('em', _('There are no active leases')));
+                                       }
                                });
                        });
 

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js
new file mode 100644 (file)
index 0000000..ee2a466
--- /dev/null
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/diagnostics.js
@@ -0,0 +1,137 @@
+'use strict';
+'require fs';
+'require ui';
+'require uci';
+
+return L.view.extend({
+       handleCommand: function(exec, args) {
+               var buttons = document.querySelectorAll('.diag-action > .cbi-button');
+
+               for (var i = 0; i < buttons.length; i++)
+                       buttons[i].setAttribute('disabled', 'true');
+
+               return fs.exec(exec, args).then(function(res) {
+                       var out = document.querySelector('.command-output');
+                           out.style.display = '';
+
+                       L.dom.content(out, [ res.stdout || '', res.stderr || '' ]);
+               }).catch(function(err) {
+                       ui.addNotification(null, E('p', [ err ]))
+               }).finally(function() {
+                       for (var i = 0; i < buttons.length; i++)
+                               buttons[i].removeAttribute('disabled');
+               });
+       },
+
+       handlePing: function(ev, cmd) {
+               var exec = cmd || 'ping',
+                   addr = ev.currentTarget.parentNode.previousSibling.value,
+                   args = (exec == 'ping') ? [ '-c', '5', '-W', '1', addr ] : [ '-c', '5', addr ];
+
+               return this.handleCommand(exec, args);
+       },
+
+       handleTraceroute: function(ev, cmd) {
+               var exec = cmd || 'traceroute',
+                   addr = ev.currentTarget.parentNode.previousSibling.value,
+                   args = (exec == 'traceroute') ? [ '-q', '1', '-w', '1', '-n', addr ] : [ '-q', '1', '-w', '2', '-n', addr ];
+
+               return this.handleCommand(exec, args);
+       },
+
+       handleNslookup: function(ev, cmd) {
+               var addr = ev.currentTarget.parentNode.previousSibling.value;
+
+               return this.handleCommand('nslookup', [ addr ]);
+       },
+
+       load: function() {
+               return Promise.all([
+                       L.resolveDefault(fs.stat('/bin/ping6'), {}),
+                       L.resolveDefault(fs.stat('/usr/bin/ping6'), {}),
+                       L.resolveDefault(fs.stat('/bin/traceroute6'), {}),
+                       L.resolveDefault(fs.stat('/usr/bin/traceroute6'), {}),
+                       uci.load('luci')
+               ]);
+       },
+
+       render: function(res) {
+               var has_ping6 = res[0].path || res[1].path,
+                   has_traceroute6 = res[2].path || res[3].path,
+                       dns_host = uci.get('luci', 'diag', 'dns') || 'openwrt.org',
+                       ping_host = uci.get('luci', 'diag', 'ping') || 'openwrt.org',
+                       route_host = uci.get('luci', 'diag', 'route') || 'openwrt.org';
+
+               return E([], [
+                       E('h2', {}, [ _('Network Utilities') ]),
+                       E('div', { 'class': 'table' }, [
+                               E('div', { 'class': 'tr' }, [
+                                       E('div', { 'class': 'td left' }, [
+                                               E('input', {
+                                                       'style': 'margin:5px 0',
+                                                       'type': 'text',
+                                                       'value': ping_host
+                                               }),
+                                               E('span', { 'class': 'diag-action' }, [
+                                                       has_ping6 ? new ui.ComboButton('ping', {
+                                                               'ping': '%s %s'.format(_('IPv4'), _('Ping')),
+                                                               'ping6': '%s %s'.format(_('IPv6'), _('Ping')),
+                                                       }, {
+                                                               'click': ui.createHandlerFn(this, 'handlePing'),
+                                                               'classes': {
+                                                                       'ping': 'cbi-button cbi-button-action',
+                                                                       'ping6': 'cbi-button cbi-button-action'
+                                                               }
+                                                       }).render() : E('button', {
+                                                               'class': 'cbi-button cbi-button-action',
+                                                               'click': ui.createHandlerFn(this, 'handlePing')
+                                                       }, [ _('Ping') ])
+                                               ])
+                                       ]),
+
+                                       E('div', { 'class': 'td left' }, [
+                                               E('input', {
+                                                       'style': 'margin:5px 0',
+                                                       'type': 'text',
+                                                       'value': route_host
+                                               }),
+                                               E('span', { 'class': 'diag-action' }, [
+                                                       has_traceroute6 ? new ui.ComboButton('traceroute', {
+                                                               'traceroute': '%s %s'.format(_('IPv4'), _('Traceroute')),
+                                                               'traceroute6': '%s %s'.format(_('IPv6'), _('Traceroute')),
+                                                       }, {
+                                                               'click': ui.createHandlerFn(this, 'handleTraceroute'),
+                                                               'classes': {
+                                                                       'traceroute': 'cbi-button cbi-button-action',
+                                                                       'traceroute6': 'cbi-button cbi-button-action'
+                                                               }
+                                                       }).render() : E('button', {
+                                                               'class': 'cbi-button cbi-button-action',
+                                                               'click': ui.createHandlerFn(this, 'handleTraceroute')
+                                                       }, [ _('Traceroute') ])
+                                               ])
+                                       ]),
+
+                                       E('div', { 'class': 'td left' }, [
+                                               E('input', {
+                                                       'style': 'margin:5px 0',
+                                                       'type': 'text',
+                                                       'value': dns_host
+                                               }),
+                                               E('span', { 'class': 'diag-action' }, [
+                                                       E('button', {
+                                                               'class': 'cbi-button cbi-button-action',
+                                                               'click': ui.createHandlerFn(this, 'handleNslookup')
+                                                       }, [ _('Nslookup') ])
+                                               ])
+                                       ])
+                               ])
+                       ]),
+                       E('pre', { 'class': 'command-output', 'style': 'display:none' })
+               ]);
+       },
+
+       handleSaveApply: null,
+       handleSave: null,
+       handleReset: null
+});

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
index 9ca7773fe1d2e51abd9028b684a762bcef3d672d..280356efbad61509f4f00ff8ccb8295380da263f 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
@@ -160,8 +160,8 @@ function iface_updown(up, id, ev, force) {
        btns[1].disabled = true;
 
        if (!up) {
-               L.Request.get(L.url('admin/network/remote_addr')).then(function(res) {
-                       var info = res.json();
+               L.resolveDefault(fs.exec_direct('/usr/libexec/luci-peeraddr')).then(function(res) {
+                       var info = null; try { info = JSON.parse(res); } catch(e) {}
 
                        if (L.isObject(info) &&
                            Array.isArray(info.inbound_interfaces) &&

diff --git a/modules/luci-mod-network/luasrc/controller/admin/network.lua b/modules/luci-mod-network/luasrc/controller/admin/network.lua
deleted file mode 100644 (file)
index bd00235..0000000
--- a/modules/luci-mod-network/luasrc/controller/admin/network.lua
+++ /dev/null
@@ -1,167 +0,0 @@
--- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2011-2018 Jo-Philipp Wich <jo@mein.io>
--- Licensed to the public under the Apache License 2.0.
-
-module("luci.controller.admin.network", package.seeall)
-
-function index()
-       local page
-
---     if page.inreq then
-               page = entry({"admin", "network", "switch"}, view("network/switch"), _("Switch"), 20)
-               page.uci_depends = { network = { ["@switch[0]"] = "switch" } }
-
-               page = entry({"admin", "network", "wireless"}, view("network/wireless"), _('Wireless'), 15)
-               page.uci_depends = { wireless = { ["@wifi-device[0]"] = "wifi-device" } }
-               page.leaf = true
-
-               page = entry({"admin", "network", "remote_addr"}, call("remote_addr"), nil)
-               page.leaf = true
-
-               page = entry({"admin", "network", "network"}, view("network/interfaces"), _("Interfaces"), 10)
-               page.leaf   = true
-               page.subindex = true
-
-               page = node("admin", "network", "dhcp")
-               page.uci_depends = { dhcp = true }
-               page.target = view("network/dhcp")
-               page.title  = _("DHCP and DNS")
-               page.order  = 30
-
-               page = node("admin", "network", "hosts")
-               page.uci_depends = { dhcp = true }
-               page.target = view("network/hosts")
-               page.title  = _("Hostnames")
-               page.order  = 40
-
-               page  = node("admin", "network", "routes")
-               page.target = view("network/routes")
-               page.title  = _("Static Routes")
-               page.order  = 50
-
-               page = node("admin", "network", "diagnostics")
-               page.target = template("admin_network/diagnostics")
-               page.title  = _("Diagnostics")
-               page.order  = 60
-
-               page = entry({"admin", "network", "diag_ping"}, post("diag_ping"), nil)
-               page.leaf = true
-
-               page = entry({"admin", "network", "diag_nslookup"}, post("diag_nslookup"), nil)
-               page.leaf = true
-
-               page = entry({"admin", "network", "diag_traceroute"}, post("diag_traceroute"), nil)
-               page.leaf = true
-
-               page = entry({"admin", "network", "diag_ping6"}, post("diag_ping6"), nil)
-               page.leaf = true
-
-               page = entry({"admin", "network", "diag_traceroute6"}, post("diag_traceroute6"), nil)
-               page.leaf = true
---     end
-end
-
-local function addr2dev(addr, src)
-       local ip = require "luci.ip"
-       local route = ip.route(addr, src)
-       if not src and route and route.src then
-               route = ip.route(addr, route.src:string())
-       end
-       return route and route.dev
-end
-
-function remote_addr()
-       local uci    = require "luci.model.uci"
-       local peer   = luci.http.getenv("REMOTE_ADDR")
-       local serv   = luci.http.getenv("SERVER_ADDR")
-       local device = addr2dev(peer, serv)
-       local ifaces = luci.util.ubus("network.interface", "dump")
-       local indevs = {}
-       local inifs  = {}
-
-       local result = {
-               remote_addr        = peer,
-               server_addr        = serv,
-               inbound_devices    = {},
-               inbound_interfaces = {}
-       }
-
-       if type(ifaces) == "table" and type(ifaces.interface) == "table" then
-               for _, iface in ipairs(ifaces.interface) do
-                       if type(iface) == "table" then
-                               if iface.device == device or iface.l3_device == device then
-                                       inifs[iface.interface] = true
-                                       indevs[device] = true
-                               end
-
-                               local peeraddr = uci:get("network", iface.interface, "peeraddr")
-                               for _, ai in ipairs(peeraddr and nixio.getaddrinfo(peeraddr) or {}) do
-                                       local peerdev = addr2dev(ai.address)
-                                       if peerdev then
-                                               for _, iface in ipairs(ifaces.interface) do
-                                                       if type(iface) == "table" and
-                                                          (iface.device == peerdev or iface.l3_device == peerdev)
-                                                       then
-                                                               inifs[iface.interface] = true
-                                                               indevs[peerdev] = true
-                                                       end
-                                               end
-                                       end
-                               end
-                       end
-               end
-       end
-
-       for k in pairs(inifs) do
-               result.inbound_interfaces[#result.inbound_interfaces + 1] = k
-       end
-
-       for k in pairs(indevs) do
-               result.inbound_devices[#result.inbound_devices + 1] = k
-       end
-
-       luci.http.prepare_content("application/json")
-       luci.http.write_json(result)
-end
-
-function diag_command(cmd, addr)
-       if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then
-               luci.http.prepare_content("text/plain")
-
-               local util = io.popen(cmd % luci.util.shellquote(addr))
-               if util then
-                       while true do
-                               local ln = util:read("*l")
-                               if not ln then break end
-                               luci.http.write(ln)
-                               luci.http.write("\n")
-                       end
-
-                       util:close()
-               end
-
-               return
-       end
-
-       luci.http.status(500, "Bad address")
-end
-
-function diag_ping(addr)
-       diag_command("ping -c 5 -W 1 %s 2>&1", addr)
-end
-
-function diag_traceroute(addr)
-       diag_command("traceroute -q 1 -w 1 -n %s 2>&1", addr)
-end
-
-function diag_nslookup(addr)
-       diag_command("nslookup %s 2>&1", addr)
-end
-
-function diag_ping6(addr)
-       diag_command("ping6 -c 5 %s 2>&1", addr)
-end
-
-function diag_traceroute6(addr)
-       diag_command("traceroute6 -q 1 -w 2 -n %s 2>&1", addr)
-end

diff --git a/modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm b/modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm
deleted file mode 100644 (file)
index 03dd5aa..0000000
--- a/modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm
+++ /dev/null
@@ -1,117 +0,0 @@
-<%#
- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%+header%>
-
-<%
-local fs   = require "nixio.fs"
-local has_ping6 = fs.access("/bin/ping6") or fs.access("/usr/bin/ping6")
-local has_traceroute6 = fs.access("/bin/traceroute6") or fs.access("/usr/bin/traceroute6")
-
-local dns_host = luci.config.diag and luci.config.diag.dns or "dev.openwrt.org"
-local ping_host = luci.config.diag and luci.config.diag.ping or "dev.openwrt.org"
-local route_host = luci.config.diag and luci.config.diag.route or "dev.openwrt.org"
-%>
-
-<script type="text/javascript">//<![CDATA[
-       var stxhr = new XHR();
-
-       function update_status(field, proto)
-       {
-               var tool = field.name;
-               var addr = field.value;
-               var protocol = proto ? "6" : "";
-
-               var legend = document.getElementById('diag-rc-legend');
-               var output = document.getElementById('diag-rc-output');
-
-               if (legend && output)
-               {
-                       output.innerHTML =
-                               '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> ' +
-                               '<%:Waiting for command to complete...%>'
-                       ;
-
-                       legend.parentNode.style.display = 'block';
-                       legend.style.display = 'inline';
-
-                       stxhr.post('<%=url('admin/network')%>/diag_' + tool + protocol + '/' + addr, { token: '<%=token%>' },
-                               function(x)
-                               {
-                                       if (x.responseText)
-                                       {
-                                               legend.style.display = 'none';
-                                               output.innerHTML = String.format('<pre>%h</pre>', x.responseText);
-                                       }
-                                       else
-                                       {
-                                               legend.style.display = 'none';
-                                               output.innerHTML = '<span class="error"><%:Bad address specified!%></span>';
-                                       }
-                               }
-                       );
-               }
-       }
-//]]></script>
-
-<form method="post" action="<%=url('admin/network/diagnostics')%>">
-       <div class="cbi-map">
-               <h2 name="content"><%:Diagnostics%></h2>
-
-               <div class="cbi-section">
-                       <legend><%:Network Utilities%></legend>
-
-                       <div class="table">
-                               <div class="tr">
-                                       <div class="td left">
-                                               <input style="margin: 5px 0" type="text" value="<%=ping_host%>" name="ping" /><br />
-                                               <% if has_ping6 then %>
-                                               <span>
-                                                       <select name="ping_proto" style="width:auto">
-                                                               <option value="" selected="selected"><%:IPv4%></option>
-                                                               <option value="6"><%:IPv6%></option>
-                                                       </select>
-                                               </span>
-                                               <input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping, this.form.ping_proto.selectedIndex)" />
-                                               <% else %>
-                                               <input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping)" />
-                                               <% end %>
-                                       </div>
-
-                                       <div class="td left">
-                                               <input style="margin: 5px 0" type="text" value="<%=route_host%>" name="traceroute" /><br />
-                                               <% if has_traceroute6 then %>
-                                               <span>
-                                                       <select name="traceroute_proto" style="width:auto">
-                                                               <option value="" selected="selected"><%:IPv4%></option>
-                                                               <option value="6"><%:IPv6%></option>
-                                                       </select>
-                                               </span>
-                                               <input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute, this.form.traceroute_proto.selectedIndex)" />
-                                               <% else %>
-                                               <input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute)" />
-                                               <% end %>
-                                               <% if not has_traceroute6 then %>
-                                                       <p>&#160;</p>
-                                                       <p><%:Install iputils-traceroute6 for IPv6 traceroute%></p>
-                                               <% end %>
-                                       </div>
-
-                                       <div class="td left">
-                                               <input style="margin: 5px 0" type="text" value="<%=dns_host%>" name="nslookup" /><br />
-                                               <input type="button" value="<%:Nslookup%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.nslookup)" />
-                                       </div>
-                               </div>
-                       </div>
-               </div>
-       </div>
-
-       <div class="cbi-section" style="display:none">
-               <strong id="diag-rc-legend"></strong>
-               <span id="diag-rc-output"></span>
-       </div>
-</form>
-
-<%+footer%>

diff --git a/modules/luci-mod-network/root/usr/libexec/luci-peeraddr b/modules/luci-mod-network/root/usr/libexec/luci-peeraddr
new file mode 100755 (executable)
index 0000000..84a0158
--- /dev/null
+++ b/modules/luci-mod-network/root/usr/libexec/luci-peeraddr
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+NL="
+"
+
+function ifaces_by_device() {
+       ubus call network.interface dump 2>/dev/null | \
+               jsonfilter -e "@.interface[@.device='$1' || @.l3_device='$1'].interface"
+}
+
+function device_by_addr() {
+       set -- $(ip route get "$1" ${2:+from "$2"} 2>/dev/null)
+       echo "$5"
+}
+
+for inbound_device in $(device_by_addr "$REMOTE_ADDR" "$SERVER_ADDR"); do
+       inbound_devices="$inbound_device"
+       inbound_interfaces=""
+
+       for iface in $(ifaces_by_device "$inbound_device"); do
+               inbound_interfaces="${inbound_interfaces:+$inbound_interfaces$NL}$iface"
+
+               for peeraddr in $(uci get "network.$iface.peeraddr"); do
+                       for ipaddr in $(resolveip -t 1 "$peeraddr" 2>/dev/null); do
+                               for peerdev in $(device_by_addr "$ipaddr"); do
+                                       for iface in $(ifaces_by_device "$peerdev"); do
+                                               inbound_devices="${inbound_devices:+$inbound_devices$NL}$peerdev"
+                                               inbound_interfaces="${inbound_interfaces:+$inbound_interfaces$NL}$iface"
+                                       done
+                               done
+                       done
+               done
+       done
+done
+
+inbound_devices="$(echo "$inbound_devices" | sort -u | sed ':a;N;$!ba;s/\n/", "/g')"
+inbound_interfaces="$(echo "$inbound_interfaces" | sort -u | sed ':a;N;$!ba;s/\n/", "/g')"
+
+cat <<JSON
+{
+       "remote_addr": "$REMOTE_ADDR",
+       "server_addr": "$SERVER_ADDR",
+       "inbound_devices": [ ${inbound_devices:+\"$inbound_devices\"} ],
+       "inbound_interfaces": [ ${inbound_interfaces:+\"$inbound_interfaces\"} ]
+}
+JSON

diff --git a/modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json b/modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json
new file mode 100644 (file)
index 0000000..670f2c1
--- /dev/null
+++ b/modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json
@@ -0,0 +1,85 @@
+{
+       "admin/network/switch": {
+               "title": "Switch",
+               "order": 20,
+               "action": {
+                       "type": "view",
+                       "path": "network/switch"
+               },
+               "depends": {
+                       "fs": { "/sbin/swconfig": "executable" },
+                       "uci": { "network": { "@switch": true } }
+               }
+       },
+
+       "admin/network/wireless": {
+               "title": "Wireless",
+               "order": 15,
+               "action": {
+                       "type": "view",
+                       "path": "network/wireless"
+               },
+               "depends": {
+                       "uci": { "wireless": { "@wifi-device": true } }
+               }
+       },
+
+       "admin/network/remote_addr/*": {
+               "action": {
+                       "type": "call",
+                       "module": "luci.controller.admin.network",
+                       "function": "remote_addr"
+               }
+       },
+
+       "admin/network/network": {
+               "title": "Interfaces",
+               "order": 10,
+               "action": {
+                       "type": "view",
+                       "path": "network/interfaces"
+               }
+       },
+
+       "admin/network/dhcp": {
+               "title": "DHCP and DNS",
+               "order": 30,
+               "action": {
+                       "type": "view",
+                       "path": "network/dhcp"
+               },
+               "depends": {
+                       "uci": { "dhcp": true }
+               }
+       },
+
+       "admin/network/hosts": {
+               "title": "Hostnames",
+               "order": 40,
+               "action": {
+                       "type": "view",
+                       "path": "network/hosts"
+               },
+               "depends": {
+                       "uci": { "dhcp": true }
+               }
+       },
+
+       "admin/network/routes": {
+               "title": "Static Routes",
+               "order": 50,
+               "action": {
+                       "type": "view",
+                       "path": "network/routes"
+               }
+       },
+
+       "admin/network/diagnostics": {
+               "title": "Diagnostics",
+               "order": 60,
+               "action": {
+                       "type": "view",
+                       "path": "network/diagnostics"
+               }
+       }
+}

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js
new file mode 100644 (file)
index 0000000..3b9428e
--- /dev/null
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js
@@ -0,0 +1,35 @@
+'use strict';
+'require fs';
+'require ui';
+
+return L.view.extend({
+       load: function() {
+               return fs.exec_direct('/bin/dmesg', [ '-r' ]).catch(function(err) {
+                       ui.addNotification(null, E('p', {}, _('Unable to load log data: ' + err.message)));
+                       return '';
+               });
+       },
+
+       render: function(logdata) {
+               var loglines = logdata.trim().split(/\n/).map(function(line) {
+                       return line.replace(/^<\d+>/, '');
+               });
+
+               return E([], [
+                       E('h2', {}, [ _('Kernel Log') ]),
+                       E('div', { 'id': 'content_syslog' }, [
+                               E('textarea', {
+                                       'id': 'syslog',
+                                       'style': 'font-size:12px',
+                                       'readonly': 'readonly',
+                                       'wrap': 'off',
+                                       'rows': loglines.length + 1
+                               }, [ loglines.join('\n') ])
+                       ])
+               ]);
+       },
+
+       handleSaveApply: null,
+       handleSave: null,
+       handleReset: null
+});

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
index 83c0c151eb49307a120c9d7ac289788f89d05198..b1068f0e360e52c5b2411e2306f20434069698df 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
@@ -28,7 +28,7 @@ return L.Class.extend({
                                E('div', { 'class': 'th' }, _('Hostname')),
                                E('div', { 'class': 'th' }, _('IPv4-Address')),
                                E('div', { 'class': 'th' }, _('MAC-Address')),
-                               E('div', { 'class': 'th' }, _('Leasetime remaining'))
+                               E('div', { 'class': 'th' }, _('Lease time remaining'))
                        ])
                ]);
 
@@ -55,7 +55,7 @@ return L.Class.extend({
                                E('div', { 'class': 'th' }, _('Host')),
                                E('div', { 'class': 'th' }, _('IPv6-Address')),
                                E('div', { 'class': 'th' }, _('DUID')),
-                               E('div', { 'class': 'th' }, _('Leasetime remaining'))
+                               E('div', { 'class': 'th' }, _('Lease time remaining'))
                        ])
                ]);
 

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js
index 282cafcbaa6e46081baef2384173680d16289073..5a3d64e7ac60fe181bcd1c89792b82e8953af84e 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js
@@ -24,15 +24,15 @@ function renderbox(dsl) {
                                _('Line Attenuation (LATN)'), '%.1f dB / %.1f dB'.format(dsl.line_attenuation_down, dsl.line_attenuation_up),
                                _('Signal Attenuation (SATN)'), '%.1f dB / %.1f dB'.format(dsl.signal_attenuation_down, dsl.signal_attenuation_up),
                                _('Noise Margin (SNR)'), '%.1f dB / %.1f dB'.format(dsl.noise_margin_down, dsl.noise_margin_up),
-                               _('Aggregate Transmit Power(ACTATP)'), '%.1f dB / %.1f dB'.format(dsl.actatp_down, dsl.actatp_up),
+                               _('Aggregate Transmit Power (ACTATP)'), '%.1f dB / %.1f dB'.format(dsl.actatp_down, dsl.actatp_up),
                                _('Forward Error Correction Seconds (FECS)'), '%d / %d'.format(dsl.errors_fecs_near, dsl.errors_fecs_far),
                                _('Errored seconds (ES)'), '%d / %d'.format(dsl.errors_es_near, dsl.errors_es_far),
                                _('Severely Errored Seconds (SES)'), '%d / %d'.format(dsl.errors_ses_near, dsl.errors_ses_far),
                                _('Loss of Signal Seconds (LOSS)'), '%d / %d'.format(dsl.errors_loss_near, dsl.errors_loss_far),
                                _('Unavailable Seconds (UAS)'), '%d / %d'.format(dsl.errors_uas_near, dsl.errors_uas_far),
                                _('Header Error Code Errors (HEC)'), '%d / %d'.format(dsl.errors_hec_near, dsl.errors_hec_far),
-                               _('Non Pre-emtive CRC errors (CRC_P)'), '%d / %d'.format(dsl.errors_crc_p_near, dsl.errors_crc_p_far),
-                               _('Pre-emtive CRC errors (CRCP_P)'), '%d / %d'.format(dsl.errors_crcp_p_near, dsl.errors_crcp_p_far),
+                               _('Non Pre-emptive CRC errors (CRC_P)'), '%d / %d'.format(dsl.errors_crc_p_near, dsl.errors_crc_p_far),
+                               _('Pre-emptive CRC errors (CRCP_P)'), '%d / %d'.format(dsl.errors_crcp_p_near, dsl.errors_crcp_p_far),
                                _('ATU-C System Vendor ID'), dsl.atuc_vendor_id,
                                _('Power Management Mode'), dsl.power_mode_s
                        ])

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js
index eaeba578fe1c6a3eff3ccbfe63ccf027ced4db54..04abcba9d05794e897e8496e6add8abc1a29e669 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js
@@ -1,232 +1,196 @@
-var table_names = [ 'Filter', 'NAT', 'Mangle', 'Raw' ],
-    current_mode = document.querySelector('.cbi-tab[data-mode="6"]') ? 6 : 4;
-
-function create_table_section(table)
-{
-       var idiv = document.getElementById('iptables'),
-           tdiv = idiv.querySelector('[data-table="%s"]'.format(table)),
-           title = '%s: %s'.format(_('Table'), table);
-
-       if (!tdiv) {
-               tdiv = E('div', { 'data-table': table }, [
-                       E('h3', {}, title),
-                       E('div')
-               ]);
+'use strict';
+'require fs';
+'require ui';
+
+var table_names = [ 'Filter', 'NAT', 'Mangle', 'Raw' ];
+
+return L.view.extend({
+       load: function() {
+               return L.resolveDefault(fs.stat('/usr/sbin/ip6tables'));
+       },
+
+       createTableSection: function(is_ipv6, table) {
+               var idiv = document.querySelector('div[data-tab="%s"]'.format(is_ipv6 ? 'ip6tables' : 'iptables')),
+                   tdiv = idiv.querySelector('[data-table="%s-%s"]'.format(is_ipv6 ? 'ipv6' : 'ipv4', table)),
+                   title = '%s: %s'.format(_('Table'), table);
+
+               if (!tdiv) {
+                       tdiv = E('div', { 'data-table': '%s-%s'.format(is_ipv6 ? 'ipv6' : 'ipv4', table) }, [
+                               E('h3', {}, title),
+                               E('div')
+                       ]);
 
-               if (idiv.firstElementChild.nodeName.toLowerCase() === 'p')
-                       idiv.removeChild(idiv.firstElementChild);
+                       if (idiv.firstElementChild.nodeName.toLowerCase() === 'p')
+                               idiv.removeChild(idiv.firstElementChild);
 
-               var added = false, thisIdx = table_names.indexOf(table);
+                       var added = false, thisIdx = table_names.indexOf(table);
 
-               idiv.querySelectorAll('[data-table]').forEach(function(child) {
-                       var childIdx = table_names.indexOf(child.getAttribute('data-table'));
+                       idiv.querySelectorAll('[data-table]').forEach(function(child) {
+                               var childIdx = table_names.indexOf(child.getAttribute('data-table').split(/-/)[1]);
 
-                       if (added === false && childIdx > thisIdx) {
-                               idiv.insertBefore(tdiv, child);
-                               added = true;
-                       }
-               });
-
-               if (added === false)
-                       idiv.appendChild(tdiv);
-       }
-
-       return tdiv.lastElementChild;
-}
-
-function create_chain_section(table, chain, policy, packets, bytes, references)
-{
-       var tdiv = create_table_section(table),
-           cdiv = tdiv.querySelector('[data-chain="%s"]'.format(chain)),
-           title;
-
-       if (policy)
-               title = '%s <em>%s</em> <span>(%s: <em>%s</em>, %d %s, %.2mB %s)</span>'
-                       .format(_('Chain'), chain, _('Policy'), policy, packets, _('Packets'), bytes, _('Traffic'));
-       else
-               title = '%s <em>%s</em> <span class="references">(%d %s)</span>'
-                       .format(_('Chain'), chain, references, _('References'));
-
-       if (!cdiv) {
-               cdiv = E('div', { 'data-chain': chain }, [
-                       E('h4', { 'id': 'rule_%s_%s'.format(table.toLowerCase(), chain) }, title),
-                       E('div', { 'class': 'table' }, [
-                               E('div', { 'class': 'tr table-titles' }, [
-                                       E('div', { 'class': 'th center' }, _('Pkts.')),
-                                       E('div', { 'class': 'th center' }, _('Traffic')),
-                                       E('div', { 'class': 'th' }, _('Target')),
-                                       E('div', { 'class': 'th' }, _('Prot.')),
-                                       E('div', { 'class': 'th' }, _('In')),
-                                       E('div', { 'class': 'th' }, _('Out')),
-                                       E('div', { 'class': 'th' }, _('Source')),
-                                       E('div', { 'class': 'th' }, _('Destination')),
-                                       E('div', { 'class': 'th' }, _('Options')),
-                                       E('div', { 'class': 'th' }, _('Comment'))
-                               ])
-                       ])
-               ]);
+                               if (added === false && childIdx > thisIdx) {
+                                       idiv.insertBefore(tdiv, child);
+                                       added = true;
+                               }
+                       });
 
-               tdiv.appendChild(cdiv);
-       }
-       else {
-               cdiv.firstElementChild.innerHTML = title;
-       }
-
-       return cdiv.lastElementChild;
-}
-
-function update_chain_section(chaintable, rows)
-{
-       if (!chaintable)
-               return;
-
-       cbi_update_table(chaintable, rows, _('No rules in this chain.'));
-
-       if (rows.length === 0 &&
-           document.querySelector('form > [data-hide-empty="true"]'))
-               chaintable.parentNode.style.display = 'none';
-       else
-               chaintable.parentNode.style.display = '';
-
-       chaintable.parentNode.setAttribute('data-empty', rows.length === 0);
-}
-
-function hide_empty(btn)
-{
-       var hide = (btn.getAttribute('data-hide-empty') === 'false');
-
-       btn.setAttribute('data-hide-empty', hide);
-       btn.value = hide ? _('Show empty chains') : _('Hide empty chains');
-       btn.blur();
-
-       document.querySelectorAll('[data-chain][data-empty="true"]')
-               .forEach(function(chaintable) {
-                       chaintable.style.display = hide ? 'none' : '';
-               });
-}
-
-function jump_target(ev)
-{
-       var link = ev.target,
-           table = findParent(link, '[data-table]').getAttribute('data-table'),
-           chain = link.textContent,
-           num = +link.getAttribute('data-num'),
-           elem = document.getElementById('rule_%s_%s'.format(table.toLowerCase(), chain));
-
-       if (elem) {
-               (document.documentElement || document.body.parentNode || document.body).scrollTop = elem.offsetTop - 40;
-               elem.classList.remove('flash');
-               void elem.offsetWidth;
-               elem.classList.add('flash');
-
-               if (num) {
-                       var rule = elem.nextElementSibling.childNodes[num];
-                       if (rule) {
-                               rule.classList.remove('flash');
-                               void rule.offsetWidth;
-                               rule.classList.add('flash');
-                       }
+                       if (added === false)
+                               idiv.appendChild(tdiv);
                }
-       }
-}
-
-function parse_output(table, s)
-{
-       var current_chain = null;
-       var current_rules = [];
-       var seen_chains = {};
-       var chain_refs = {};
-       var re = /([^\n]*)\n/g;
-       var m, m2;
-
-       while ((m = re.exec(s)) != null) {
-               if (m[1].match(/^Chain (.+) \(policy (\w+) (\d+) packets, (\d+) bytes\)$/)) {
-                       var chain = RegExp.$1,
-                           policy = RegExp.$2,
-                           packets = +RegExp.$3,
-                           bytes = +RegExp.$4;
-
-                       update_chain_section(current_chain, current_rules);
-
-                       seen_chains[chain] = true;
-                       current_chain = create_chain_section(table, chain, policy, packets, bytes);
-                       current_rules = [];
-               }
-               else if (m[1].match(/^Chain (.+) \((\d+) references\)$/)) {
-                       var chain = RegExp.$1,
-                           references = +RegExp.$2;
 
-                       update_chain_section(current_chain, current_rules);
+               return tdiv.lastElementChild;
+       },
+
+       createChainSection: function(is_ipv6, table, chain, policy, packets, bytes, references) {
+               var tdiv = this.createTableSection(is_ipv6, table),
+                   cdiv = tdiv.querySelector('[data-chain="%s"]'.format(chain)),
+                   title;
+
+               if (policy)
+                       title = '%s <em>%s</em> <span>(%s: <em>%s</em>, %d %s, %.2mB %s)</span>'
+                               .format(_('Chain'), chain, _('Policy'), policy, packets, _('Packets'), bytes, _('Traffic'));
+               else
+                       title = '%s <em>%s</em> <span class="references">(%d %s)</span>'
+                               .format(_('Chain'), chain, references, _('References'));
+
+               if (!cdiv) {
+                       cdiv = E('div', { 'data-chain': chain }, [
+                               E('h4', { 'id': 'rule_%s-%s_%s'.format(is_ipv6 ? 'ipv6' : 'ipv4', table.toLowerCase(), chain) }, title),
+                               E('div', { 'class': 'table' }, [
+                                       E('div', { 'class': 'tr table-titles' }, [
+                                               E('div', { 'class': 'th center' }, _('Pkts.')),
+                                               E('div', { 'class': 'th center' }, _('Traffic')),
+                                               E('div', { 'class': 'th' }, _('Target')),
+                                               E('div', { 'class': 'th' }, _('Prot.')),
+                                               E('div', { 'class': 'th' }, _('In')),
+                                               E('div', { 'class': 'th' }, _('Out')),
+                                               E('div', { 'class': 'th' }, _('Source')),
+                                               E('div', { 'class': 'th' }, _('Destination')),
+                                               E('div', { 'class': 'th' }, _('Options')),
+                                               E('div', { 'class': 'th' }, _('Comment'))
+                                       ])
+                               ])
+                       ]);
 
-                       seen_chains[chain] = true;
-                       current_chain = create_chain_section(table, chain, null, null, null, references);
-                       current_rules = [];
+                       tdiv.appendChild(cdiv);
                }
-               else if (m[1].match(/^num /)) {
-                       continue;
+               else {
+                       cdiv.firstElementChild.innerHTML = title;
                }
-               else if ((m2 = m[1].match(/^(\d+) +(\d+) +(\d+) +(.*?) +(\S+) +(\S*) +(\S+) +(\S+) +([a-f0-9:.]+(?:\/[a-f0-9:.]+)?) +([a-f0-9:.]+(?:\/[a-f0-9:.]+)?) +(.+)$/)) !== null) {
-                       var num = +m2[1],
-                           pkts = +m2[2],
-                           bytes = +m2[3],
-                           target = m2[4],
-                           proto = m2[5],
-                           indev = m2[7],
-                           outdev = m2[8],
-                           srcnet = m2[9],
-                           dstnet = m2[10],
-                           options = m2[11] || '-',
-                           comment = '-';
-
-                       options = options.trim().replace(/(?:^| )\/\* (.+) \*\//,
-                               function(m1, m2) {
-                                       comment = m2.replace(/^!fw3(: |$)/, '').trim() || '-';
-                                       return '';
-                               }) || '-';
-
-                       current_rules.push([
-                               '%.2m'.format(pkts).nobr(),
-                               '%.2mB'.format(bytes).nobr(),
-                               target ? '<span class="target">%s</span>'.format(target) : '-',
-                               proto,
-                               (indev !== '*') ? '<span class="ifacebadge">%s</span>'.format(indev) : '*',
-                               (outdev !== '*') ? '<span class="ifacebadge">%s</span>'.format(outdev) : '*',
-                               srcnet,
-                               dstnet,
-                               options,
-                               [ comment ]
-                       ]);
 
-                       if (target) {
-                               chain_refs[target] = chain_refs[target] || [];
-                               chain_refs[target].push([ current_chain, num ]);
+               return cdiv.lastElementChild;
+       },
+
+       updateChainSection: function(chaintable, rows) {
+               if (!chaintable)
+                       return;
+
+               cbi_update_table(chaintable, rows, _('No rules in this chain.'));
+
+               if (rows.length === 0 &&
+                   document.querySelector('[data-hide-empty="true"]'))
+                       chaintable.parentNode.style.display = 'none';
+               else
+                       chaintable.parentNode.style.display = '';
+
+               chaintable.parentNode.setAttribute('data-empty', rows.length === 0);
+       },
+
+       parseIptablesDump: function(is_ipv6, table, s) {
+               var current_chain = null;
+               var current_rules = [];
+               var seen_chains = {};
+               var chain_refs = {};
+               var re = /([^\n]*)\n/g;
+               var m, m2;
+
+               while ((m = re.exec(s)) != null) {
+                       if (m[1].match(/^Chain (.+) \(policy (\w+) (\d+) packets, (\d+) bytes\)$/)) {
+                               var chain = RegExp.$1,
+                                   policy = RegExp.$2,
+                                   packets = +RegExp.$3,
+                                   bytes = +RegExp.$4;
+
+                               this.updateChainSection(current_chain, current_rules);
+
+                               seen_chains[chain] = true;
+                               current_chain = this.createChainSection(is_ipv6, table, chain, policy, packets, bytes);
+                               current_rules = [];
+                       }
+                       else if (m[1].match(/^Chain (.+) \((\d+) references\)$/)) {
+                               var chain = RegExp.$1,
+                                   references = +RegExp.$2;
+
+                               this.updateChainSection(current_chain, current_rules);
+
+                               seen_chains[chain] = true;
+                               current_chain = this.createChainSection(is_ipv6, table, chain, null, null, null, references);
+                               current_rules = [];
+                       }
+                       else if (m[1].match(/^num /)) {
+                               continue;
+                       }
+                       else if ((m2 = m[1].match(/^(\d+) +(\d+) +(\d+) +(.*?) +(\S+) +(\S*) +(\S+) +(\S+) +([a-f0-9:.]+(?:\/[a-f0-9:.]+)?) +([a-f0-9:.]+(?:\/[a-f0-9:.]+)?) +(.+)$/)) !== null) {
+                               var num = +m2[1],
+                                   pkts = +m2[2],
+                                   bytes = +m2[3],
+                                   target = m2[4],
+                                   proto = m2[5],
+                                   indev = m2[7],
+                                   outdev = m2[8],
+                                   srcnet = m2[9],
+                                   dstnet = m2[10],
+                                   options = m2[11] || '-',
+                                   comment = '-';
+
+                               options = options.trim().replace(/(?:^| )\/\* (.+) \*\//,
+                                       function(m1, m2) {
+                                               comment = m2.replace(/^!fw3(: |$)/, '').trim() || '-';
+                                               return '';
+                                       }) || '-';
+
+                               current_rules.push([
+                                       '%.2m'.format(pkts).nobr(),
+                                       '%.2mB'.format(bytes).nobr(),
+                                       target ? '<span class="target">%s</span>'.format(target) : '-',
+                                       proto,
+                                       (indev !== '*') ? '<span class="ifacebadge">%s</span>'.format(indev) : '*',
+                                       (outdev !== '*') ? '<span class="ifacebadge">%s</span>'.format(outdev) : '*',
+                                       srcnet,
+                                       dstnet,
+                                       options,
+                                       [ comment ]
+                               ]);
+
+                               if (target) {
+                                       chain_refs[target] = chain_refs[target] || [];
+                                       chain_refs[target].push([ current_chain, num ]);
+                               }
                        }
                }
-       }
 
-       update_chain_section(current_chain, current_rules);
+               this.updateChainSection(current_chain, current_rules);
 
-       document.querySelectorAll('[data-table="%s"] [data-chain]'.format(table))
-               .forEach(function(cdiv) {
+               document.querySelectorAll('[data-table="%s-%s"] [data-chain]'.format(is_ipv6 ? 'ipv6' : 'ipv4', table)).forEach(L.bind(function(cdiv) {
                        if (!seen_chains[cdiv.getAttribute('data-chain')]) {
                                cdiv.parentNode.removeChild(cdiv);
                                return;
                        }
 
-                       cdiv.querySelectorAll('.target').forEach(function(tspan) {
+                       cdiv.querySelectorAll('.target').forEach(L.bind(function(tspan) {
                                if (seen_chains[tspan.textContent]) {
                                        tspan.classList.add('jump');
-                                       tspan.addEventListener('click', jump_target);
+                                       tspan.addEventListener('click', this.handleJumpTarget);
                                }
-                       });
+                       }, this));
 
-                       cdiv.querySelectorAll('.references').forEach(function(rspan) {
+                       cdiv.querySelectorAll('.references').forEach(L.bind(function(rspan) {
                                var refs = chain_refs[cdiv.getAttribute('data-chain')];
                                if (refs && refs.length) {
                                        rspan.classList.add('cbi-tooltip-container');
                                        rspan.appendChild(E('small', { 'class': 'cbi-tooltip ifacebadge', 'style': 'top:1em; left:auto' }, [ E('ul') ]));
 
-                                       refs.forEach(function(ref) {
+                                       refs.forEach(L.bind(function(ref) {
                                                var chain = ref[0].parentNode.getAttribute('data-chain'),
                                                    num = ref[1];
 
@@ -235,19 +199,136 @@ function parse_output(table, s)
                                                        E('span', {
                                                                'class': 'jump',
                                                                'data-num': num,
-                                                               'onclick': 'jump_target(event)'
+                                                               'click': this.handleJumpTarget
                                                        }, chain),
                                                        ', %s #%d'.format(_('Rule'), num)
                                                ]));
-                                       });
+                                       }, this));
+                               }
+                       }, this));
+               }, this));
+       },
+
+       pollFirewallLists: function(has_ip6tables) {
+               var cmds = [ '/usr/sbin/iptables' ];
+
+               if (has_ip6tables)
+                       cmds.push('/usr/sbin/ip6tables');
+
+               L.Poll.add(L.bind(function() {
+                       var tasks = [];
+
+                       for (var i = 0; i < cmds.length; i++) {
+                               for (var j = 0; j < table_names.length; j++) {
+                                       tasks.push(L.resolveDefault(
+                                               fs.exec_direct(cmds[i], [ '--line-numbers', '-w', '-nvxL', '-t', table_names[j].toLowerCase() ])
+                                                       .then(this.parseIptablesDump.bind(this, i > 0, table_names[j]))));
+                               }
+                       }
+
+                       return Promise.all(tasks);
+               }, this));
+       },
+
+       handleJumpTarget: function(ev) {
+               var link = ev.target,
+                   table = findParent(link, '[data-table]').getAttribute('data-table'),
+                   chain = link.textContent,
+                   num = +link.getAttribute('data-num'),
+                   elem = document.getElementById('rule_%s_%s'.format(table.toLowerCase(), chain));
+
+               if (elem) {
+                       (document.documentElement || document.body.parentNode || document.body).scrollTop = elem.offsetTop - 40;
+                       elem.classList.remove('flash');
+                       void elem.offsetWidth;
+                       elem.classList.add('flash');
+
+                       if (num) {
+                               var rule = elem.nextElementSibling.childNodes[num];
+                               if (rule) {
+                                       rule.classList.remove('flash');
+                                       void rule.offsetWidth;
+                                       rule.classList.add('flash');
                                }
+                       }
+               }
+       },
+
+       handleHideEmpty: function(ev) {
+               var btn = ev.currentTarget,
+                   hide = (btn.getAttribute('data-hide-empty') === 'false');
+
+               btn.setAttribute('data-hide-empty', hide);
+               btn.firstChild.data = hide ? _('Show empty chains') : _('Hide empty chains');
+               btn.blur();
+
+               document.querySelectorAll('[data-chain][data-empty="true"]')
+                       .forEach(function(chaintable) {
+                               chaintable.style.display = hide ? 'none' : '';
                        });
-               });
-}
-
-table_names.forEach(function(table) {
-       L.poll(5, L.url('admin/status/iptables_dump', current_mode, table.toLowerCase()), null,
-               function (xhr) {
-                       parse_output(table, xhr.responseText);
-               });
+       },
+
+       handleCounterReset: function(has_ip6tables, ev) {
+               return Promise.all([
+                       fs.exec('/usr/sbin/iptables', [ '-Z' ])
+                               .catch(function(err) { ui.addNotification(null, E('p', {}, _('Unable to reset iptables counters: %s').format(err.message))) }),
+                       has_ip6tables ? fs.exec('/usr/sbin/ip6tables', [ '-Z' ])
+                               .catch(function(err) { ui.addNotification(null, E('p', {}, _('Unable to reset ip6tables counters: %s').format(err.message))) }) : null
+               ]);
+       },
+
+       handleRestart: function(ev) {
+               return fs.exec_direct('/etc/init.d/firewall', [ 'restart' ])
+                               .catch(function(err) { ui.addNotification(null, E('p', {}, _('Unable to restart firewall: %s').format(err.message))) });
+       },
+
+       render: function(has_ip6tables) {
+               var view = E([], [
+                       E('style', { 'type': 'text/css' }, [
+                               '.cbi-tooltip-container, span.jump { border-bottom:1px dotted #00f;cursor:pointer }',
+                               'ul { list-style:none }',
+                               '.references { position:relative }',
+                               '.references .cbi-tooltip { left:0!important;top:1.5em!important }',
+                               'h4>span { font-size:90% }'
+                       ]),
+
+                       E('h2', {}, [ _('Firewall Status') ]),
+                       E('div', { 'class': 'right', 'style': 'margin-bottom:-1.5em' }, [
+                               E('button', {
+                                       'class': 'cbi-button',
+                                       'data-hide-empty': false,
+                                       'click': ui.createHandlerFn(this, 'handleHideEmpty')
+                               }, [ _('Hide empty chains') ]),
+                               ' ',
+                               E('button', {
+                                       'class': 'cbi-button',
+                                       'click': ui.createHandlerFn(this, 'handleCounterReset', has_ip6tables)
+                               }, [ _('Reset Counters') ]),
+                               ' ',
+                               E('button', {
+                                       'class': 'cbi-button',
+                                       'click': ui.createHandlerFn(this, 'handleRestart')
+                               }, [ _('Restart Firewall') ])
+                       ]),
+                       E('div', {}, [
+                               E('div', { 'data-tab': 'iptables', 'data-tab-title': has_ip6tables ? _('IPv4 Firewall') : null }, [
+                                       E('p', {}, E('em', { 'class': 'spinning' }, [ _('Collecting data...') ]))
+                               ]),
+                               has_ip6tables ? E('div', { 'data-tab': 'ip6tables', 'data-tab-title': _('IPv6 Firewall') }, [
+                                       E('p', {}, E('em', { 'class': 'spinning' }, [ _('Collecting data...') ]))
+                               ]) : E([])
+                       ])
+               ]);
+
+               if (has_ip6tables)
+                       ui.tabs.initTabGroup(view.lastElementChild.childNodes);
+
+               this.pollFirewallLists(has_ip6tables);
+
+               return view;
+       },
+
+       handleSaveApply: null,
+       handleSave: null,
+       handleReset: null
 });

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js
new file mode 100644 (file)
index 0000000..a296b62
--- /dev/null
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js
@@ -0,0 +1,216 @@
+'use strict';
+'require fs';
+'require rpc';
+'require validation';
+
+var callNetworkInterfaceDump = rpc.declare({
+       object: 'network.interface',
+       method: 'dump',
+       expect: { interface: [] }
+});
+
+function applyMask(addr, mask, v6) {
+       var words = v6 ? validation.parseIPv6(addr) : validation.parseIPv4(addr);
+
+       if (!words || mask < 0 || mask > (v6 ? 128 : 32))
+               return null;
+
+       for (var i = 0; i < words.length; i++) {
+               var b = Math.min(mask, v6 ? 16 : 8);
+               words[i] &= ((1 << b) - 1);
+               mask -= b;
+       }
+
+       return String.prototype.format.apply(
+               v6 ? '%x:%x:%x:%x:%x:%x:%x:%x' : '%d.%d.%d.%d', words);
+}
+
+return L.view.extend({
+       load: function() {
+               return Promise.all([
+                       callNetworkInterfaceDump(),
+                       L.resolveDefault(fs.exec('/sbin/ip', [ '-4', 'neigh', 'show' ]), {}),
+                       L.resolveDefault(fs.exec('/sbin/ip', [ '-4', 'route', 'show', 'table', 'all' ]), {}),
+                       L.resolveDefault(fs.exec('/sbin/ip', [ '-6', 'neigh', 'show' ]), {}),
+                       L.resolveDefault(fs.exec('/sbin/ip', [ '-6', 'route', 'show', 'table', 'all' ]), {})
+               ]);
+       },
+
+       getNetworkByDevice(networks, dev, addr, mask, v6) {
+               var addr_arrays = [ 'ipv4-address', 'ipv6-address', 'ipv6-prefix', 'ipv6-prefix-assignment', 'route' ],
+                   matching_iface = null,
+                   matching_prefix = -1;
+
+               for (var i = 0; i < networks.length; i++) {
+                       if (!L.isObject(networks[i]))
+                               continue;
+
+                       if (networks[i].l3_device != dev && networks[i].device != dev)
+                               continue;
+
+                       for (var j = 0; j < addr_arrays.length; j++) {
+                               var addr_list = networks[i][addr_arrays[j]];
+
+                               if (!Array.isArray(addr_list) || addr_list.length == 0)
+                                       continue;
+
+                               for (var k = 0; k < addr_list.length; k++) {
+                                       var cmp_addr = addr_list[k].address || addr_list[k].target,
+                                           cmp_mask = addr_list[k].mask;
+
+                                       if (cmp_addr == null)
+                                               continue;
+
+                                       var addr1 = applyMask(cmp_addr, cmp_mask, v6),
+                                           addr2 = applyMask(addr, cmp_mask, v6);
+
+                                       if (addr1 != addr2 || mask < cmp_mask)
+                                               continue;
+
+                                       if (cmp_mask > matching_prefix) {
+                                               matching_iface = networks[i].interface;
+                                               matching_prefix = cmp_mask;
+                                       }
+                               }
+                       }
+               }
+
+               return matching_iface;
+       },
+
+       parseNeigh: function(s, networks, v6) {
+               var lines = s.trim().split(/\n/),
+                   res = [];
+
+               for (var i = 0; i < lines.length; i++) {
+                       var m = lines[i].match(/^([0-9a-f:.]+) (.+) (\S+)$/),
+                           addr = m ? m[1] : null,
+                           flags = m ? m[2].trim().split(/\s+/) : [],
+                           state = (m ? m[3] : null) || 'FAILED';
+
+                       if (!addr || state == 'FAILED' || addr.match(/^fe[89a-f][0-9a-f]:/))
+                               continue;
+
+                       for (var j = 0; j < flags.length; j += 2)
+                               flags[flags[j]] = flags[j + 1];
+
+                       if (!flags.lladdr)
+                               continue;
+
+                       var net = this.getNetworkByDevice(networks, flags.dev, addr, v6 ? 128 : 32, v6);
+
+                       res.push([
+                               addr,
+                               flags.lladdr.toUpperCase(),
+                               E('span', { 'class': 'ifacebadge' }, [ net ? net : '(%s)'.format(flags.dev) ])
+                       ]);
+               }
+
+               return res;
+       },
+
+       parseRoute: function(s, networks, v6) {
+               var lines = s.trim().split(/\n/),
+                   res = [];
+
+               for (var i = 0; i < lines.length; i++) {
+                       var m = lines[i].match(/^(?:([a-z_]+|\d+) )?(default|[0-9a-f:.\/]+) (.+)$/),
+                           type = (m ? m[1] : null) || 'unicast',
+                           dest = m ? (m[2] == 'default' ? (v6 ? '::/0' : '0.0.0.0/0') : m[2]) : null,
+                           flags = m ? m[3].trim().split(/\s+/) : [];
+
+                       console.debug(lines[i], m);
+
+                       if (!dest || type != 'unicast' || dest == 'fe80::/64' || dest == 'ff00::/8')
+                               continue;
+
+                       for (var j = 0; j < flags.length; j += 2)
+                               flags[flags[j]] = flags[j + 1];
+
+                       var addr = dest.split('/'),
+                           bits = (addr[1] != null) ? +addr[1] : (v6 ? 128 : 32),
+                           net = this.getNetworkByDevice(networks, flags.dev, addr[0], bits, v6);
+
+                       res.push([
+                               E('span', { 'class': 'ifacebadge' }, [ net ? net : '(%s)'.format(flags.dev) ]),
+                               dest,
+                               (v6 ? flags.from : flags.via) || '-',
+                               String(flags.metric || 0),
+                               flags.table || 'main'
+                       ]);
+               }
+
+               return res;
+       },
+
+       render: function(data) {
+               var networks = data[0],
+                   ip4neigh = data[1].stdout || '',
+                   ip4route = data[2].stdout || '',
+                   ip6neigh = data[3].stdout || '',
+                   ip6route = data[4].stdout || '';
+
+               var neigh4tbl = E('div', { 'class': 'table' }, [
+                       E('div', { 'class': 'tr table-titles' }, [
+                               E('div', { 'class': 'th' }, [ _('IPv4-Address') ]),
+                               E('div', { 'class': 'th' }, [ _('MAC-Address') ]),
+                               E('div', { 'class': 'th' }, [ _('Interface') ])
+                       ])
+               ]);
+
+               var route4tbl = E('div', { 'class': 'table' }, [
+                       E('div', { 'class': 'tr table-titles' }, [
+                               E('div', { 'class': 'th' }, [ _('Network') ]),
+                               E('div', { 'class': 'th' }, [ _('Target') ]),
+                               E('div', { 'class': 'th' }, [ _('IPv4-Gateway') ]),
+                               E('div', { 'class': 'th' }, [ _('Metric') ]),
+                               E('div', { 'class': 'th' }, [ _('Table') ])
+                       ])
+               ]);
+
+               var neigh6tbl = E('div', { 'class': 'table' }, [
+                       E('div', { 'class': 'tr table-titles' }, [
+                               E('div', { 'class': 'th' }, [ _('IPv6-Address') ]),
+                               E('div', { 'class': 'th' }, [ _('MAC-Address') ]),
+                               E('div', { 'class': 'th' }, [ _('Interface') ])
+                       ])
+               ]);
+
+               var route6tbl = E('div', { 'class': 'table' }, [
+                       E('div', { 'class': 'tr table-titles' }, [
+                               E('div', { 'class': 'th' }, [ _('Network') ]),
+                               E('div', { 'class': 'th' }, [ _('Target') ]),
+                               E('div', { 'class': 'th' }, [ _('Source') ]),
+                               E('div', { 'class': 'th' }, [ _('Metric') ]),
+                               E('div', { 'class': 'th' }, [ _('Table') ])
+                       ])
+               ]);
+
+               cbi_update_table(neigh4tbl, this.parseNeigh(ip4neigh, networks, false));
+               cbi_update_table(route4tbl, this.parseRoute(ip4route, networks, false));
+               cbi_update_table(neigh6tbl, this.parseNeigh(ip6neigh, networks, true));
+               cbi_update_table(route6tbl, this.parseRoute(ip6route, networks, true));
+
+               return E([], [
+                       E('h2', {}, [ _('Routes') ]),
+                       E('p', {}, [ _('The following rules are currently active on this system.') ]),
+
+                       E('h3', {}, [ _('ARP') ]),
+                       neigh4tbl,
+
+                       E('h3', {}, _('Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Routes')),
+                       route4tbl,
+
+                       E('h3', {}, [ _('IPv6 Neighbours') ]),
+                       neigh6tbl,
+
+                       E('h3', {}, _('Active <abbr title="Internet Protocol Version 6">IPv6</abbr>-Routes')),
+                       route6tbl
+               ]);
+       },
+
+       handleSaveApply: null,
+       handleSave: null,
+       handleReset: null
+});
+

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js
new file mode 100644 (file)
index 0000000..69694bc
--- /dev/null
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js
@@ -0,0 +1,33 @@
+'use strict';
+'require fs';
+'require ui';
+
+return L.view.extend({
+       load: function() {
+               return fs.exec_direct('/sbin/logread', [ '-e', '^' ]).catch(function(err) {
+                       ui.addNotification(null, E('p', {}, _('Unable to load log data: ' + err.message)));
+                       return '';
+               });
+       },
+
+       render: function(logdata) {
+               var loglines = logdata.trim().split(/\n/);
+
+               return E([], [
+                       E('h2', {}, [ _('System Log') ]),
+                       E('div', { 'id': 'content_syslog' }, [
+                               E('textarea', {
+                                       'id': 'syslog',
+                                       'style': 'font-size:12px',
+                                       'readonly': 'readonly',
+                                       'wrap': 'off',
+                                       'rows': loglines.length + 1
+                               }, [ loglines.join('\n') ])
+                       ])
+               ]);
+       },
+
+       handleSaveApply: null,
+       handleSave: null,
+       handleReset: null
+});

diff --git a/modules/luci-mod-status/luasrc/controller/admin/status.lua b/modules/luci-mod-status/luasrc/controller/admin/status.lua
deleted file mode 100644 (file)
index 6f84149..0000000
--- a/modules/luci-mod-status/luasrc/controller/admin/status.lua
+++ /dev/null
@@ -1,74 +0,0 @@
--- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-module("luci.controller.admin.status", package.seeall)
-
-function index()
-       local page
-
-       entry({"admin", "status", "overview"}, template("admin_status/index"), _("Overview"), 1)
-
-       entry({"admin", "status", "iptables"}, template("admin_status/iptables"), _("Firewall"), 2).leaf = true
-       entry({"admin", "status", "iptables_dump"}, call("dump_iptables")).leaf = true
-       entry({"admin", "status", "iptables_action"}, post("action_iptables")).leaf = true
-
-       entry({"admin", "status", "routes"}, template("admin_status/routes"), _("Routes"), 3)
-       entry({"admin", "status", "syslog"}, call("action_syslog"), _("System Log"), 4)
-       entry({"admin", "status", "dmesg"}, call("action_dmesg"), _("Kernel Log"), 5)
-       entry({"admin", "status", "processes"}, view("status/processes"), _("Processes"), 6)
-
-       entry({"admin", "status", "realtime"}, alias("admin", "status", "realtime", "load"), _("Realtime Graphs"), 7)
-
-       entry({"admin", "status", "realtime", "load"}, view("status/load"), _("Load"), 1)
-       entry({"admin", "status", "realtime", "bandwidth"}, view("status/bandwidth"), _("Traffic"), 2)
-       entry({"admin", "status", "realtime", "wireless"}, view("status/wireless"), _("Wireless"), 3).uci_depends = { wireless = true }
-       entry({"admin", "status", "realtime", "connections"}, view("status/connections"), _("Connections"), 4)
-
-       entry({"admin", "status", "nameinfo"}, call("action_nameinfo")).leaf = true
-end
-
-function action_syslog()
-       local syslog = luci.sys.syslog()
-       luci.template.render("admin_status/syslog", {syslog=syslog})
-end
-
-function action_dmesg()
-       local dmesg = luci.sys.dmesg()
-       luci.template.render("admin_status/dmesg", {dmesg=dmesg})
-end
-
-function dump_iptables(family, table)
-       local prefix = (family == "6") and "ip6" or "ip"
-       local ok, lines = pcall(io.lines, "/proc/net/%s_tables_names" % prefix)
-       if ok and lines then
-               local s
-               for s in lines do
-                       if s == table then
-                               luci.http.prepare_content("text/plain")
-                               luci.sys.process.exec({
-                                       "/usr/sbin/%stables" % prefix, "-w", "-t", table,
-                                       "--line-numbers", "-nxvL"
-                               }, luci.http.write)
-                               return
-                       end
-               end
-       end
-
-       luci.http.status(404, "No such table")
-       luci.http.prepare_content("text/plain")
-end
-
-function action_iptables()
-       if luci.http.formvalue("zero") then
-               if luci.http.formvalue("family") == "6" then
-                       luci.util.exec("/usr/sbin/ip6tables -Z")
-               else
-                       luci.util.exec("/usr/sbin/iptables -Z")
-               end
-       elseif luci.http.formvalue("restart") then
-               luci.util.exec("/etc/init.d/firewall restart")
-       end
-
-       luci.http.redirect(luci.dispatcher.build_url("admin/status/iptables"))
-end

diff --git a/modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm b/modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm
deleted file mode 100644 (file)
index 1a8770e..0000000
--- a/modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-<%#
- Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%+header%>
-<h2 name="content"><%:Kernel Log%></h2>
-<div id="content_syslog">
-<textarea style="font-size: 12px;" readonly="readonly" wrap="off" rows="<%=dmesg:cmatch("\n")+2%>" id="syslog"><%=dmesg:pcdata()%></textarea>
-</div>
-<%+footer%>

diff --git a/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm b/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm
deleted file mode 100644 (file)
index 89f229f..0000000
--- a/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm
+++ /dev/null
@@ -1,73 +0,0 @@
-<%#
- Copyright 2008-2009 Steven Barth <steven@midlink.org>
- Copyright 2008-2018 Jo-Philipp Wich <jo@mein.io>
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%-
-       local fs = require "nixio.fs"
-       local has_ip6tables = fs.access("/usr/sbin/ip6tables")
-       local mode = 4
-
-       if has_ip6tables then
-               mode = luci.dispatcher.context.requestpath
-           mode = tonumber(mode[#mode] ~= "iptables" and mode[#mode]) or 4
-       end
--%>
-
-<%+header%>
-
-<style type="text/css">
-       span.jump, .cbi-tooltip-container {
-               border-bottom: 1px dotted blue;
-               cursor: pointer;
-       }
-
-       ul {
-               list-style: none;
-       }
-
-       .references {
-               position: relative;
-       }
-
-       .references .cbi-tooltip {
-               left: 0 !important;
-               top: 1.5em !important;
-       }
-
-       h4 > span {
-               font-size: 90%;
-       }
-</style>
-
-<h2 name="content"><%:Firewall Status%></h2>
-
-<% if has_ip6tables then %>
-<ul class="cbi-tabmenu">
-       <li data-mode="4" class="cbi-tab<%= mode ~= 4 and "-disabled" %>">
-               <a href="<%=url("admin/status/iptables/4")%>"><%:IPv4 Firewall%></a>
-       </li>
-       <li data-mode="6" class="cbi-tab<%= mode ~= 6 and "-disabled" %>">
-               <a href="<%=url("admin/status/iptables/6")%>"><%:IPv6 Firewall%></a>
-       </li>
-</ul>
-<% end %>
-
-<div style="position: relative">
-       <form method="post" action="<%=url("admin/status/iptables_action")%>" style="position: absolute; right: 0">
-               <input type="hidden" name="token" value="<%=token%>" />
-               <input type="hidden" name="family" value="<%=mode%>" />
-               <input type="button" class="cbi-button" data-hide-empty="false" value="<%:Hide empty chains%>" onclick="hide_empty(this)" />
-               <input type="submit" class="cbi-button" name="zero" value="<%:Reset Counters%>" />
-               <input type="submit" class="cbi-button" name="restart" value="<%:Restart Firewall%>" />
-       </form>
-</div>
-
-<div id="iptables">
-       <p><em class="spinning"><%:Collecting data...%></em></p>
-</div>
-
-<script type="text/javascript" src="<%=resource%>/view/status/iptables.js"></script>
-
-<%+footer%>

diff --git a/modules/luci-mod-status/luasrc/view/admin_status/routes.htm b/modules/luci-mod-status/luasrc/view/admin_status/routes.htm
deleted file mode 100644 (file)
index 74779f6..0000000
--- a/modules/luci-mod-status/luasrc/view/admin_status/routes.htm
+++ /dev/null
@@ -1,156 +0,0 @@
-<%#
- Copyright 2008-2009 Steven Barth <steven@midlink.org>
- Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org>
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%-
-       require "luci.tools.webadmin"
-       require "nixio.fs"
-
-       local ip = require "luci.ip"
-       local style = true
-       local _, v
-
-       local rtn = {
-               [255] = "local",
-               [254] = "main",
-               [253] = "default",
-               [0]   = "unspec"
-       }
-
-       if nixio.fs.access("/etc/iproute2/rt_tables") then
-               local ln
-               for ln in io.lines("/etc/iproute2/rt_tables") do
-                       local i, n = ln:match("^(%d+)%s+(%S+)")
-                       if i and n then
-                               rtn[tonumber(i)] = n
-                       end
-               end
-       end
--%>
-
-<%+header%>
-
-
-<div class="cbi-map" id="cbi-network">
-       <h2 name="content"><%:Routes%></h2>
-       <div class="cbi-map-descr"><%:The following rules are currently active on this system.%></div>
-
-       <div class="cbi-section">
-               <legend>ARP</legend>
-               <div class="cbi-section-node">
-                       <div class="table">
-                               <div class="tr table-titles">
-                                       <div class="th"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address%></div>
-                                       <div class="th"><%_<abbr title="Media Access Control">MAC</abbr>-Address%></div>
-                                       <div class="th"><%:Interface%></div>
-                               </div>
-
-                               <%
-                                       for _, v in ipairs(ip.neighbors({ family = 4 })) do
-                                               if v.mac then
-                               %>
-                               <div class="tr cbi-rowstyle-<%=(style and 1 or 2)%>">
-                                       <div class="td"><%=v.dest%></div>
-                                       <div class="td"><%=v.mac%></div>
-                                       <div class="td"><%=luci.tools.webadmin.iface_get_network(v.dev) or '(' .. v.dev .. ')'%></div>
-                               </div>
-                               <%
-                                                       style = not style
-                                               end
-                                       end
-                               %>
-                       </div>
-               </div>
-       </div>
-
-       <div class="cbi-section">
-               <legend><%_Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Routes%></legend>
-               <div class="cbi-section-node">
-                       <div class="table">
-                               <div class="tr table-titles">
-                                       <div class="th"><%:Network%></div>
-                                       <div class="th"><%:Target%></div>
-                                       <div class="th"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-Gateway%></div>
-                                       <div class="th"><%:Metric%></div>
-                                       <div class="th"><%:Table%></div>
-                               </div>
-                               <% for _, v in ipairs(ip.routes({ family = 4, type = 1 })) do %>
-                               <div class="tr cbi-rowstyle-<%=(style and 1 or 2)%>">
-                                       <div class="td"><%=luci.tools.webadmin.iface_get_network(v.dev) or v.dev%></div>
-                                       <div class="td"><%=v.dest%></div>
-                                       <div class="td"><%=v.gw or "-"%></div>
-                                       <div class="td"><%=v.metric or 0%></div>
-                                       <div class="td"><%=rtn[v.table] or v.table%></div>
-                               </div>
-                               <% style = not style end %>
-                       </div>
-               </div>
-       </div>
-
-       <%
-               if nixio.fs.access("/proc/net/ipv6_route") then
-                       style = true
-       %>
-       <div class="cbi-section">
-               <legend><%_Active <abbr title="Internet Protocol Version 6">IPv6</abbr>-Routes%></legend>
-               <div class="cbi-section-node">
-                       <div class="table">
-                               <div class="tr table-titles">
-                                       <div class="th"><%:Network%></div>
-                                       <div class="th"><%:Target%></div>
-                                       <div class="th"><%:Source%></div>
-                                       <div class="th"><%:Metric%></div>
-                                       <div class="th"><%:Table%></div>
-                               </div>
-                               <%
-                                       for _, v in ipairs(ip.routes({ family = 6, type = 1 })) do
-                                               if v.dest and not v.dest:is6linklocal() then
-                               %>
-                               <div class="tr cbi-rowstyle-<%=(style and 1 or 2)%>">
-                                       <div class="td"><%=luci.tools.webadmin.iface_get_network(v.dev) or '(' .. v.dev .. ')'%></div>
-                                       <div class="td"><%=v.dest%></div>
-                                       <div class="td"><%=v.from%></div>
-                                       <div class="td"><%=v.metric or 0%></div>
-                                       <div class="td"><%=rtn[v.table] or v.table%></div>
-                               </div>
-                               <%
-                                                       style = not style
-                                               end
-                                       end
-                               %>
-                       </div>
-               </div>
-       </div>
-
-       <div class="cbi-section">
-               <legend><%:IPv6 Neighbours%></legend>
-               <div class="cbi-section-node">
-                       <div class="table">
-                               <div class="tr table-titles">
-                                       <div class="th"><%:IPv6-Address%></div>
-                                       <div class="th"><%:MAC-Address%></div>
-                                       <div class="th"><%:Interface%></div>
-                               </div>
-                               <%
-                                       for _, v in ipairs(ip.neighbors({ family = 6 })) do
-                                               if v.dest and not v.dest:is6linklocal() and v.mac then
-                               %>
-                               <div class="tr cbi-rowstyle-<%=(style and 1 or 2)%>">
-                                       <div class="td"><%=v.dest%></div>
-                                       <div class="td"><%=v.mac%></div>
-                                       <div class="td"><%=luci.tools.webadmin.iface_get_network(v.dev) or '(' .. v.dev .. ')'%></div>
-                               </div>
-                               <%
-                                                       style = not style
-                                               end
-                                       end
-                               %>
-                       </div>
-               </div>
-       </div>
-       <% end %>
-</div>
-
-<%+footer%>

diff --git a/modules/luci-mod-status/luasrc/view/admin_status/syslog.htm b/modules/luci-mod-status/luasrc/view/admin_status/syslog.htm
deleted file mode 100644 (file)
index fb734a7..0000000
--- a/modules/luci-mod-status/luasrc/view/admin_status/syslog.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-<%#
- Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%+header%>
-<h2 name="content"><%:System Log%></h2>
-<div id="content_syslog">
-<textarea style="font-size: 12px;" readonly="readonly" wrap="off" rows="<%=syslog:cmatch("\n")+2%>" id="syslog"><%=syslog:pcdata()%></textarea>
-</div>
-<%+footer%>

diff --git a/modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json b/modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json
new file mode 100644 (file)
index 0000000..0dcf6e8
--- /dev/null
+++ b/modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json
@@ -0,0 +1,103 @@
+{
+       "admin/status/overview": {
+               "title": "Overview",
+               "order": 1,
+               "action": {
+                       "type": "template",
+                       "path": "admin_status/index"
+               }
+       },
+
+       "admin/status/iptables": {
+               "title": "Firewall",
+               "order": 2,
+               "action": {
+                       "type": "view",
+                       "path": "status/iptables"
+               }
+       },
+
+       "admin/status/routes": {
+               "title": "Routes",
+               "order": 3,
+               "action": {
+                       "type": "view",
+                       "path": "status/routes"
+               }
+       },
+
+       "admin/status/syslog": {
+               "title": "System Log",
+               "order": 4,
+               "action": {
+                       "type": "view",
+                       "path": "status/syslog"
+               }
+       },
+
+       "admin/status/dmesg": {
+               "title": "Kernel Log",
+               "order": 5,
+               "action": {
+                       "type": "view",
+                       "path": "status/dmesg"
+               }
+       },
+
+       "admin/status/processes": {
+               "title": "Processes",
+               "order": 6,
+               "action": {
+                       "type": "view",
+                       "path": "status/processes"
+               }
+       },
+
+       "admin/status/realtime": {
+               "title": "Realtime Graphs",
+               "order": 7,
+               "action": {
+                       "type": "alias",
+                       "path": "admin/status/realtime/load"
+               }
+       },
+
+       "admin/status/realtime/load": {
+               "title": "Load",
+               "order": 1,
+               "action": {
+                       "type": "view",
+                       "path": "status/load"
+               }
+       },
+
+       "admin/status/realtime/bandwidth": {
+               "title": "Traffic",
+               "order": 2,
+               "action": {
+                       "type": "view",
+                       "path": "status/bandwidth"
+               }
+       },
+
+       "admin/status/realtime/wireless": {
+               "title": "Wireless",
+               "order": 3,
+               "action": {
+                       "type": "view",
+                       "path": "status/wireless"
+               },
+               "depends": {
+                       "uci": { "wireless": { "@wifi-device": true } }
+               }
+       },
+
+       "admin/status/realtime/connections": {
+               "title": "Connections",
+               "order": 4,
+               "action": {
+                       "type": "view",
+                       "path": "status/connections"
+               }
+       }
+}

diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
index f127501ae9313602deabac2f71a99d94eb1ba3cb..89f32b06ae4e2cb9a61861939a2b79b3a72df2ab 100644 (file)
--- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
@@ -1196,7 +1196,6 @@ footer {
        background: #fff;
        box-shadow: 0 0 3px #444;
        padding: 1em 1em .5em 1em;
-       max-height: 2400px;
        min-width: 270px;
 }
 

diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm
index e0a41e1bca43ece81cbfa01d7b32a1d1a2f7bec9..ec6895f06d098edff3141bbcf17b9c62ecc9e5d1 100644 (file)
--- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm
+++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm
@@ -5,25 +5,12 @@
  Licensed to the public under the Apache License 2.0.
 -%>
 
-<%
-       local ver = require "luci.version"
-       local disp = require "luci.dispatcher"
-       local request  = disp.context.path
-       local category = request[1]
-       local tree = disp.node()
-       local categories = disp.node_childs(tree)
-%>
+<% local ver = require "luci.version" %>
+
    <footer>
     <a href="https://github.com/openwrt/luci">Powered by <%= ver.luciname %> (<%= ver.luciversion %>)</a> / <%= ver.distversion %>
-    <% if #categories > 1 then %>
-     <ul class="breadcrumb pull-right" id="modemenu">
-           <% for i, r in ipairs(categories) do %>
-                   <li<% if request[1] == r then %> class="active"<%end%>><a href="<%=controller%>/<%=r%>/"><%=striptags(translate(tree.nodes[r].title))%></a> <span class="divider">|</span></li>
-           <% end %>
-     </ul>
-    <% end %>
+    <ul class="breadcrumb pull-right" id="modemenu" style="display:none"></ul>
    </footer>
-   </div>
   </div>
  </body>
 </html>

diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
index de1fd73f0e8c765eb02ba3a90b6ebd019de925db..56a1b230e40228c9c46e1391c55508cf4ce27319 100644 (file)
--- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
+++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
@@ -13,123 +13,10 @@
 
        local boardinfo = util.ubus("system", "board")
 
-       local request  = disp.context.path
-       local request2 = disp.context.request
-
-       local category = request[1]
-       local cattree  = category and disp.node(category)
-
-       local leaf = request2[#request2]
-
-       local tree = disp.node()
        local node = disp.context.dispatched
 
-       local categories = disp.node_childs(tree)
-
-       local c = tree
-       local i, r
-
-       -- tag all nodes leading to this page
-       for i, r in ipairs(request) do
-               if c.nodes and c.nodes[r] then
-                       c = c.nodes[r]
-                       c._menu_selected = true
-               end
-       end
-
        -- send as HTML5
        http.prepare_content("text/html")
-
-       local function nodeurl(prefix, name, query)
-               local u = url(prefix, name)
-               if query then
-                       u = u .. http.build_querystring(query)
-               end
-               return pcdata(u)
-       end
-
-       local function render_tabmenu(prefix, node, level)
-               if not level then
-                       level = 1
-               end
-
-               local childs = disp.node_childs(node)
-               if #childs > 0 then
-                       if level > 2 then
-                               write('<ul class="tabs">')
-                       end
-
-                       local selected_node
-                       local selected_name
-                       local i, v
-
-                       for i, v in ipairs(childs) do
-                               local nnode = node.nodes[v]
-                               if nnode._menu_selected then
-                                       selected_node = nnode
-                                       selected_name = v
-                               end
-
-                               if level > 2 then
-                                       write('<li class="tabmenu-item-%s %s"><a href="%s">%s</a></li>' %{
-                                               v, (nnode._menu_selected or (node.leaf and v == leaf)) and 'active' or '',
-                                               nodeurl(prefix, v, nnode.query),
-                                               striptags(translate(nnode.title))
-                                       })
-                               end
-                       end
-
-                       if level > 2 then
-                               write('</ul>')
-                       end
-
-                       if selected_node then
-                               render_tabmenu(prefix .. "/" .. selected_name, selected_node, level + 1)
-                       end
-               end
-       end
-
-       local function render_submenu(prefix, node)
-               local childs = disp.node_childs(node)
-               if #childs > 0 then
-                       write('<ul class="dropdown-menu">')
-
-                       for i, r in ipairs(childs) do
-                               local nnode = node.nodes[r]
-                               write('<li><a href="%s">%s</a></li>' %{
-                                       nodeurl(prefix, r, nnode.query),
-                                       striptags(translate(nnode.title))
-                               })
-                       end
-
-                       write('</ul>')
-               end
-       end
-
-       local function render_topmenu()
-               local childs = disp.node_childs(cattree)
-               if #childs > 0 then
-                       write('<ul class="nav">')
-
-                       for i, r in ipairs(childs) do
-                               local nnode = cattree.nodes[r]
-                               local grandchildren = disp.node_childs(nnode)
-
-                               if #grandchildren > 0 then
-                                       write('<li class="dropdown"><a class="menu" href="#">%s</a>' % striptags(translate(nnode.title)))
-                                       render_submenu(category .. "/" .. r, nnode)
-                                       write('</li>')
-                               else
-                                       write('<li><a href="%s">%s</a></li>' %{
-                                               nodeurl(category, r, nnode.query),
-                                               striptags(translate(nnode.title))
-                                       })
-                               end
-                       end
-
-                       write('</ul>')
-               end
-       end
 -%>
 <!DOCTYPE html>
 <html lang="<%=luci.i18n.context.lang%>">
@@ -149,6 +36,8 @@
                <script src="<%=url('admin/translations', luci.i18n.context.lang)%><%# ?v=PKG_VERSION %>"></script>
                <script src="<%=resource%>/cbi.js"></script>
                <script src="<%=resource%>/xhr.js"></script>
+
+               <% include("themes/bootstrap/json-menu") %>
        </head>
 
        <body class="lang_<%=luci.i18n.context.lang%> <% if node then %><%= striptags( node.title ) %><%- end %>" data-page="<%= table.concat(disp.context.requestpath, "-") %>">
@@ -156,7 +45,7 @@
                        <div class="fill">
                                <div class="container">
                                        <a class="brand" href="#"><%=boardinfo.hostname or "?"%></a>
-                                       <% render_topmenu() %>
+                                       <ul class="nav" id="topmenu" style="display:none"></ul>
                                        <div class="pull-right">
                                                <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
                                                        <span class="label success" id="xhr_poll_status_on"><%:Auto Refresh%> <%:on%></span>
@@ -185,4 +74,4 @@
                                </div>
                        </noscript>
 
-                       <% if category then render_tabmenu(category, cattree) end %>
+                       <div id="tabmenu" style="display:none"></div>

diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/json-menu.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/json-menu.htm
new file mode 100644 (file)
index 0000000..b38406f
--- /dev/null
+++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/json-menu.htm
@@ -0,0 +1,119 @@
+<script type="text/javascript">
+       (function() {
+               function get_children(node) {
+                       var children = [];
+
+                       for (var k in node.children) {
+                               if (!node.children.hasOwnProperty(k))
+                                       continue;
+
+                               if (!node.children[k].satisfied)
+                                       continue;
+
+                               if (!node.children[k].hasOwnProperty('title'))
+                                       continue;
+
+                               children.push(Object.assign(node.children[k], { name: k }));
+                       }
+
+                       return children.sort(function(a, b) {
+                               return ((a.order || 1000) - (b.order || 1000));
+                       });
+               }
+
+               function render_tabmenu(tree, url, level) {
+                       var container = document.querySelector('#tabmenu'),
+                           ul = E('ul', { 'class': 'tabs' }),
+                           children = get_children(tree),
+                           activeNode = null;
+
+                       for (var i = 0; i < children.length; i++) {
+                               var isActive = (L.env.dispatchpath[3 + (level || 0)] == children[i].name),
+                                   activeClass = isActive ? ' active' : '',
+                                   className = 'tabmenu-item-%s %s'.format(children[i].name, activeClass);
+
+                               ul.appendChild(E('li', { 'class': className }, [
+                                       E('a', { 'href': L.url(url, children[i].name) }, [ _(children[i].title) ] )]));
+
+                               if (isActive)
+                                       activeNode = children[i];
+                       }
+
+                       if (ul.children.length == 0)
+                               return E([]);
+
+                       container.appendChild(ul);
+                       container.style.display = '';
+
+                       if (activeNode)
+                               render_tabmenu(activeNode, url + '/' + activeNode.name, (level || 0) + 1);
+
+                       return ul;
+               }
+
+               function render_mainmenu(tree, url, level) {
+                       var ul = level ? E('ul', { 'class': 'dropdown-menu' }) : document.querySelector('#topmenu'),
+                           children = get_children(tree);
+
+                       if (children.length == 0 || level > 1)
+                               return E([]);
+
+                       for (var i = 0; i < children.length; i++) {
+                               var submenu = render_mainmenu(children[i], url + '/' + children[i].name, (level || 0) + 1),
+                                   subclass = (!level && submenu.firstElementChild) ? 'dropdown' : null,
+                                   linkclass = (!level && submenu.firstElementChild) ? 'menu' : null,
+                                   linkurl = submenu.firstElementChild ? '#' : L.url(url, children[i].name);
+
+                               var li = E('li', { 'class': subclass }, [
+                                       E('a', { 'class': linkclass, 'href': linkurl }, [ _(children[i].title) ]),
+                                       submenu
+                               ]);
+
+                               ul.appendChild(li);
+                       }
+
+                       ul.style.display = '';
+
+                       return ul;
+               }
+
+               function render_modemenu(tree) {
+                       var ul = document.querySelector('#modemenu'),
+                           children = get_children(tree);
+
+                       for (var i = 0; i < children.length; i++) {
+                               var isActive = (L.env.requestpath.length ? children[i].name == L.env.requestpath[0] : i == 0);
+
+                               ul.appendChild(E('li', { 'class': isActive ? 'active' : null }, [
+                                       E('a', { 'href': L.url(children[i].name) }, [ _(children[i].title) ]),
+                                       ' ',
+                                       E('span', { 'class': 'divider' }, [ '|' ])
+                               ]));
+
+                               if (isActive)
+                                       render_mainmenu(children[i], children[i].name);
+                       }
+
+                       if (ul.children.length > 1)
+                               ul.style.display = '';
+               }
+
+               document.addEventListener('luci-loaded', function(ev) {
+                       var tree = <%= luci.http.write_json(luci.dispatcher.context.authsession and luci.dispatcher.menu_json() or {}) %>,
+                           node = tree,
+                           url = '';
+
+                       render_modemenu(tree);
+
+                       if (L.env.dispatchpath.length >= 3) {
+                               for (var i = 0; i < 3 && node; i++) {
+                                       node = node.children[L.env.dispatchpath[i]];
+                                       url = url + (url ? '/' : '') + L.env.dispatchpath[i];
+                               }
+
+                               if (node)
+                                       render_tabmenu(node, url);
+                       }
+               });
+       })();
+</script>

diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
index 1d78edf0cffaf6e00ee147986cab4ed60eea41e8..40ff001b9501c3b42ce890333bfcd46d8329ebe1 100644 (file)
--- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
+++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
@@ -1608,7 +1608,6 @@ body:not(.Interfaces) .cbi-rowstyle-2:first-child {
        min-width: 270px;
        max-width: 600px;
        min-height: 32px;
-       max-height: 2400px;
        margin: 5em auto;
        padding: 1em;
        border-radius: 3px !important;

diff --git a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js
index 755191f3352d8e83674cbe0bbc28c0e421723015..ae39d0075140fdbe2b8d8836d592aa56b2458f6b 100755 (executable)
--- a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js
+++ b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js
@@ -18,6 +18,7 @@
  *     Licensed to the public under the Apache License 2.0
  */
 
+document.addEventListener('luci-loaded', function(ev) {
 (function ($) {
        $(".main > .loading").fadeOut();
 
@@ -216,3 +217,4 @@
        }
 
 })(jQuery);
+});

diff --git a/themes/luci-theme-material/luasrc/view/themes/material/footer.htm b/themes/luci-theme-material/luasrc/view/themes/material/footer.htm
index 544866ddee12d0c99543fa61019dc5c29c6b599e..2f9f096bc17fccfe6c657de9ab67c0dc177ab340 100644 (file)
--- a/themes/luci-theme-material/luasrc/view/themes/material/footer.htm
+++ b/themes/luci-theme-material/luasrc/view/themes/material/footer.htm
@@ -18,27 +18,11 @@
        Licensed to the public under the Apache License 2.0
 -%>
 
-<%
-       local ver = require "luci.version"
-       local disp = require "luci.dispatcher"
-       local request  = disp.context.path
-       local category = request[1]
-       local tree = disp.node()
-       local categories = disp.node_childs(tree)
-%>
+<% local ver = require "luci.version" %>
        </div>
        <footer class="mobile-hide">
        <a href="https://github.com/openwrt/luci">Powered by <%= ver.luciname %> (<%= ver.luciversion %>)</a> / <%= ver.distversion %>
-       <% if #categories > 1 then %>
-               <ul class="breadcrumb pull-right" id="modemenu">
-               <% for i, r in ipairs(categories) do %>
-               <li<% if request[1] == r then %> class="active"<%end%>>
-                       <a href="<%=controller%>/<%=r%>/"><%=striptags(translate(tree.nodes[r].title))%></a>
-                       <span class="divider">|</span>
-               </li>
-               <% end %>
-               </ul>
-       <% end %>
+       <ul class="breadcrumb pull-right" id="modemenu" style="display:none"></ul>
        </footer>
        </div>
 </div>

diff --git a/themes/luci-theme-material/luasrc/view/themes/material/header.htm b/themes/luci-theme-material/luasrc/view/themes/material/header.htm
index 76eeec05eba97d1b9aeedf12c403e48b74021287..5595b14e49ac243341963e71ce17e9586d4e1731 100644 (file)
--- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm
+++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm
@@ -26,135 +26,10 @@
 
        local boardinfo = util.ubus("system", "board")
 
-       local request  = disp.context.path
-       local request2 = disp.context.request
-
-       local category = request[1]
-       local cattree  = category and disp.node(category)
-
-       local leaf = request2[#request2]
-
-       local tree = disp.node()
        local node = disp.context.dispatched
 
-       local categories = disp.node_childs(tree)
-
-       local c = tree
-       local i, r
-
-       -- tag all nodes leading to this page
-       for i, r in ipairs(request) do
-               if c.nodes and c.nodes[r] then
-                       c = c.nodes[r]
-                       c._menu_selected = true
-               end
-       end
-
        -- send as HTML5
        http.prepare_content("text/html")
-
-       local function nodeurl(prefix, name, query)
-               local u = url(prefix, name)
-               if query then
-                       u = u .. http.build_querystring(query)
-               end
-               return pcdata(u)
-       end
-
-       local function render_tabmenu(prefix, node, level)
-               if not level then
-                       level = 1
-               end
-
-               local childs = disp.node_childs(node)
-               if #childs > 0 then
-                       if level > 2 then
-                               write('<ul class="tabs">')
-                       end
-
-                       local selected_node
-                       local selected_name
-                       local i, v
-
-                       for i, v in ipairs(childs) do
-                               local nnode = node.nodes[v]
-                               if nnode._menu_selected then
-                                       selected_node = nnode
-                                       selected_name = v
-                               end
-
-                               if level > 2 then
-                                       write('<li class="tabmenu-item-%s %s"><a href="%s">%s</a></li>' %{
-                                               v, (nnode._menu_selected or (node.leaf and v == leaf)) and 'active' or '',
-                                               nodeurl(prefix, v, nnode.query),
-                                               striptags(translate(nnode.title))
-                                       })
-                               end
-                       end
-
-                       if level > 2 then
-                               write('</ul>')
-                       end
-
-                       if selected_node then
-                               render_tabmenu(prefix .. "/" .. selected_name, selected_node, level + 1)
-                       end
-               end
-       end
-
-       local function render_submenu(prefix, node)
-               local childs = disp.node_childs(node)
-               if #childs > 0 then
-                       write('<ul class="slide-menu">')
-
-                       for i, r in ipairs(childs) do
-                               local nnode = node.nodes[r]
-                               local title = striptags(translate(nnode.title))
-
-                               write('<li><a data-title="%s" href="%s">%s</a></li>' %{
-                                       title,
-                                       nodeurl(prefix, r, nnode.query),
-                                       title
-                               })
-                       end
-
-                       write('</ul>')
-               end
-       end
-
-       local function render_topmenu()
-               local childs = disp.node_childs(cattree)
-               if #childs > 0 then
-                       write('<ul class="nav">')
-
-                       for i, r in ipairs(childs) do
-                               local nnode = cattree.nodes[r]
-                               local grandchildren = disp.node_childs(nnode)
-
-                               if #grandchildren > 0 then
-                                       local title = striptags(translate(nnode.title))
-
-                                       write('<li class="slide"><a class="menu" data-title="%s" href="#">%s</a>' %{
-                                               title,
-                                               title
-                                       })
-
-                                       render_submenu(category .. "/" .. r, nnode)
-                                       write('</li>')
-                               else
-                                       local title = striptags(translate(nnode.title))
-
-                                       write('<li><a data-title="%s" href="%s">%s</a></li>' %{
-                                               title,
-                                               nodeurl(category, r, nnode.query),
-                                               title
-                                       })
-                               end
-                       end
-
-                       write('</ul>')
-               end
-       end
 -%>
 <!DOCTYPE html>
 <html lang="<%=luci.i18n.context.lang%>">
@@ -180,6 +55,134 @@
        <script src="<%=url('admin/translations', luci.i18n.context.lang)%><%# ?v=PKG_VERSION %>"></script>
        <script src="<%=resource%>/cbi.js"></script>
        <script src="<%=resource%>/xhr.js"></script>
+       <script type="text/javascript">//<![CDATA[
+               (function() {
+                       function get_children(node) {
+                               var children = [];
+
+                               for (var k in node.children) {
+                                       if (!node.children.hasOwnProperty(k))
+                                               continue;
+
+                                       if (!node.children[k].satisfied)
+                                               continue;
+
+                                       if (!node.children[k].hasOwnProperty('title'))
+                                               continue;
+
+                                       children.push(Object.assign(node.children[k], { name: k }));
+                               }
+
+                               return children.sort(function(a, b) {
+                                       return ((a.order || 1000) - (b.order || 1000));
+                               });
+                       }
+
+                       function render_mainmenu(tree, url, level) {
+                               var l = (level || 0) + 1,
+                                   ul = E('ul', { 'class': level ? 'slide-menu' : 'nav' }),
+                                   children = get_children(tree);
+
+                               if (children.length == 0 || l > 2)
+                                       return E([]);
+
+                               for (var i = 0; i < children.length; i++) {
+                                       var submenu = render_mainmenu(children[i], url + '/' + children[i].name, l),
+                                           hasChildren = submenu.children.length;
+
+                                       ul.appendChild(E('li', { 'class': hasChildren ? 'slide' : null }, [
+                                               E('a', {
+                                                       'href': hasChildren ? '#' : L.url(url, children[i].name),
+                                                       'class': hasChildren ? 'menu' : null,
+                                                       'data-title': hasChildren ? null : _(children[i].title),
+                                               }, [ _(children[i].title) ]),
+                                               submenu
+                                       ]));
+                               }
+
+                               if (l == 1) {
+                                       var container = document.querySelector('#mainmenu');
+
+                                       container.appendChild(ul);
+                                       container.style.display = '';
+                               }
+
+                               return ul;
+                       }
+
+                       function render_modemenu(tree) {
+                               var ul = document.querySelector('#modemenu'),
+                                   children = get_children(tree);
+
+                               for (var i = 0; i < children.length; i++) {
+                                       var isActive = (L.env.requestpath.length ? children[i].name == L.env.requestpath[0] : i == 0);
+
+                                       ul.appendChild(E('li', {}, [
+                                               E('a', {
+                                                       'href': L.url(children[i].name),
+                                                       'class': isActive ? 'active' : null
+                                               }, [ _(children[i].title) ])
+                                       ]));
+
+                                       if (isActive)
+                                               render_mainmenu(children[i], children[i].name);
+                               }
+
+                               if (ul.children.length > 1)
+                                       ul.style.display = '';
+                       }
+
+                       function render_tabmenu(tree, url, level) {
+                               var container = document.querySelector('#tabmenu'),
+                                   l = (level || 0) + 1,
+                                   ul = E('ul', { 'class': 'tabs' }),
+                                   children = get_children(tree),
+                                   activeNode = null;
+
+                               if (children.length == 0)
+                                       return E([]);
+
+                               for (var i = 0; i < children.length; i++) {
+                                       var isActive = (L.env.dispatchpath[l + 2] == children[i].name),
+                                           activeClass = isActive ? ' active' : '',
+                                           className = 'tabmenu-item-%s %s'.format(children[i].name, activeClass);
+
+                                       ul.appendChild(E('li', { 'class': className }, [
+                                               E('a', { 'href': L.url(url, children[i].name) }, [ _(children[i].title) ] )
+                                       ]));
+
+                                       if (isActive)
+                                               activeNode = children[i];
+                               }
+
+                               container.appendChild(ul);
+                               container.style.display = '';
+
+                               if (activeNode)
+                                       container.appendChild(render_tabmenu(activeNode, url + '/' + activeNode.name, l));
+
+                               return ul;
+                       }
+
+                       document.addEventListener('luci-loaded', function(ev) {
+                               var tree = <%= luci.http.write_json(luci.dispatcher.context.authsession and luci.dispatcher.menu_json() or {}) %>,
+                                   node = tree,
+                                   url = '';
+
+                               render_modemenu(tree);
+
+                               if (L.env.dispatchpath.length >= 3) {
+                                       for (var i = 0; i < 3 && node; i++) {
+                                               node = node.children[L.env.dispatchpath[i]];
+                                               url = url + (url ? '/' : '') + L.env.dispatchpath[i];
+                                       }
+
+                                       if (node)
+                                               render_tabmenu(node, url);
+                               }
+                       });
+               })();
+       //]]></script>
 </head>
 <body class="lang_<%=luci.i18n.context.lang%> <% if node then %><%= striptags( node.title ) %><% end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>" data-page="<%= table.concat(disp.context.requestpath, "-") %>">
 <header>
@@ -199,9 +202,7 @@
 </header>
 <div class="main">
        <div style="" class="loading"><span><div class="loading-img"></div><%:Collecting data...%></span></div>
-       <div class="main-left">
-               <% render_topmenu() %>
-       </div>
+       <div class="main-left" id="mainmenu" style="display:none"></div>
        <div class="main-right">
                <div class="darkMask"></div>
                <div id="maincontent">
@@ -223,4 +224,4 @@
                                        </div>
                                </noscript>
 
-                               <% if category then render_tabmenu(category, cattree) end %>
+                               <div id="tabmenu" style="display:none"></div>

diff --git a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
index faaaf220a151a23a1f9f4d326e6d9e8196aa9bd3..a1b85f658e66db34ff08e9a725837863a93bdf06 100644 (file)
--- a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
@@ -226,7 +226,6 @@ hr {
        background: #f5f5f5;
        border: 1px solid #000;
        padding: .5em .5em .25em .5em !important;
-       max-height: 2400px;
        min-width: 270px;
        color: #444;
 }
@@ -1017,6 +1016,10 @@ ul.cbi-tabmenu {
        border-bottom: 1px solid #bbb;
 }
 
+#tabmenu > ul.cbi-tabmenu {
+       margin: 0 !important;
+}
+
 ul.cbi-tabmenu li {
        display: inline-flex;
        margin: 0 5px -1px 0;

diff --git a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
index fbe030d18c54a98909f0a99b68346ffabaac1453..9754e8b61203dbe255ea57d0868941735133b7bc 100644 (file)
--- a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
@@ -15,116 +15,9 @@
        local loadinfo = sysinfo.load or { 0, 0, 0 }
        local boardinfo = util.ubus("system", "board") or { }
 
-       local request  = disp.context.path
-       local request2 = disp.context.request
-
-       local category = request[1]
-       local cattree  = category and disp.node(category)
-
-       local leaf = request2[#request2]
-
-       local tree = disp.node()
        local node = disp.context.dispatched
 
-       local categories = disp.node_childs(tree)
-
-       local c = tree
-       local i, r
-
-       -- tag all nodes leading to this page
-       for i, r in ipairs(request) do
-               if c.nodes and c.nodes[r] then
-                       c = c.nodes[r]
-                       c._menu_selected = true
-               end
-       end
-
        http.prepare_content("application/xhtml+xml")
-
-       local function nodeurl(prefix, name, query)
-               local u = url(prefix, name)
-               if query then
-                       u = u .. http.build_querystring(query)
-               end
-               return pcdata(u)
-       end
-
-       local function render_menu(prefix, node, level)
-               if not level then
-                       level = 1
-               end
-
-               local childs = disp.node_childs(node)
-               if #childs > 0 then
-                       write('<ul class="mainmenu l%d">' % level)
-
-                       local i, v
-                       for i, v in ipairs(childs) do
-                               local nnode = node.nodes[v]
-
-                               write('<li class="mainmenu-item-%s %s"><a href="%s">%s</a>' %{
-                                       v, (nnode._menu_selected or (node.leaf and v == leaf)) and 'selected' or '',
-                                       nodeurl(prefix, v, nnode.query),
-                                       striptags(translate(nnode.title))
-                               })
-
-                               if level < 2 then
-                                       render_menu(prefix .. "/" .. v, nnode, level + 1)
-                               end
-
-                               write('</li>')
-                       end
-
-                       write('</ul>')
-               end
-       end
-
-       local function render_tabmenu(prefix, node, level)
-               if not level then
-                       level = 1
-               end
-
-               local childs = disp.node_childs(node)
-               if #childs > 0 then
-                       if level > 2 then
-                               if level == 3 then
-                                       write('<div id="tabmenu">')
-                               end
-                               write('<ul class="cbi-tabmenu">')
-                       end
-
-                       local selected_node
-                       local selected_name
-                       local i, v
-
-                       for i, v in ipairs(childs) do
-                               local nnode = node.nodes[v]
-                               if nnode._menu_selected then
-                                       selected_node = nnode
-                                       selected_name = v
-                               end
-
-                               if level > 2 then
-                                       write('<li class="tabmenu-item-%s %s"><a href="%s">%s</a></li>' %{
-                                               v, (nnode._menu_selected or (node.leaf and v == leaf)) and 'cbi-tab' or '',
-                                               nodeurl(prefix, v, nnode.query),
-                                               striptags(translate(nnode.title))
-                                       })
-                               end
-                       end
-
-                       if level > 2 then
-                               write('</ul>')
-                               if level == 3 then
-                                       write('</div>')
-                               end
-                       end
-
-                       if selected_node then
-                               render_tabmenu(prefix .. "/" .. selected_name, selected_node, level + 1)
-                       end
-               end
-       end
 -%>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -145,45 +38,153 @@
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
 <script type="text/javascript" src="<%=resource%>/xhr.js"></script>
 <script type="text/javascript">//<![CDATA[
-       document.addEventListener('DOMContentLoaded', function() {
-               var event = ('ontouchstart' in window) ? 'touchstart' : 'click';
+       (function() {
+               function get_children(node) {
+                       var children = [];
 
-               document.querySelectorAll('ul.mainmenu.l1 > li > a').forEach(function(a) {
-                       a.addEventListener(event, function(ev) {
-                               var a = ev.target, ul1 = a.parentNode.parentNode, ul2 = a.nextElementSibling;
+                       for (var k in node.children) {
+                               if (!node.children.hasOwnProperty(k))
+                                       continue;
 
-                               document.querySelectorAll('ul.mainmenu.l1 > li.active').forEach(function(li) {
-                                       if (li !== a.parentNode)
-                                               li.classList.remove('active');
-                               });
+                               if (!node.children[k].satisfied)
+                                       continue;
 
-                               if (!ul2)
-                                       return;
+                               if (!node.children[k].hasOwnProperty('title'))
+                                       continue;
 
-                               if (ul2.parentNode.offsetLeft + ul2.offsetWidth <= ul1.offsetLeft + ul1.offsetWidth)
-                                       ul2.classList.add('align-left');
+                               children.push(Object.assign(node.children[k], { name: k }));
+                       }
 
-                               ul1.classList.add('active');
-                               a.parentNode.classList.add('active');
-                               a.blur();
+                       return children.sort(function(a, b) {
+                               return ((a.order || 1000) - (b.order || 1000));
+                       });
+               }
+
+               function handle_mainmenu_expand(ev) {
+                       var a = ev.target, ul1 = a.parentNode.parentNode, ul2 = a.nextElementSibling;
 
-                               ev.preventDefault();
-                               ev.stopPropagation();
+                       document.querySelectorAll('ul.mainmenu.l1 > li.active').forEach(function(li) {
+                               if (li !== a.parentNode)
+                                       li.classList.remove('active');
                        });
-               });
 
-               document.addEventListener(event, function(ev) {
-                       var t = ev.target;
+                       if (!ul2)
+                               return;
+
+                       if (ul2.parentNode.offsetLeft + ul2.offsetWidth <= ul1.offsetLeft + ul1.offsetWidth)
+                               ul2.classList.add('align-left');
 
-                       while (t && t.id != 'mainmenu')
-                               t = t.parentNode;
+                       ul1.classList.add('active');
+                       a.parentNode.classList.add('active');
+                       a.blur();
 
-                       if (!t)
-                               document.querySelectorAll('ul.mainmenu > li.active').forEach(function(li) {
-                                       li.classList.remove('active');
-                               });
+                       ev.preventDefault();
+                       ev.stopPropagation();
+               }
+
+               function render_mainmenu(tree, url, level) {
+                       var l = (level || 0) + 1,
+                           ul = E('ul', { 'class': 'mainmenu l%d'.format(l) }),
+                           children = get_children(tree);
+
+                       if (children.length == 0 || l > 2)
+                               return E([]);
+
+                       for (var i = 0; i < children.length; i++) {
+                               var isActive = (L.env.dispatchpath[l] == children[i].name),
+                                   activeClass = 'mainmenu-item-%s%s'.format(children[i].name, isActive ? ' selected' : '');
+
+                               ul.appendChild(E('li', { 'class': activeClass }, [
+                                       E('a', {
+                                               'href': L.url(url, children[i].name),
+                                               'click': (l == 1) ? handle_mainmenu_expand : null,
+                                       }, [ _(children[i].title) ]),
+                                       render_mainmenu(children[i], url + '/' + children[i].name, l)
+                               ]));
+                       }
+
+                       if (l == 1) {
+                               var container = document.querySelector('#mainmenu');
+
+                               container.appendChild(ul);
+                               container.style.display = '';
+                       }
+
+                       return ul;
+               }
+
+               function render_modemenu(tree) {
+                       var ul = document.querySelector('#modemenu'),
+                           children = get_children(tree);
+
+                       for (var i = 0; i < children.length; i++) {
+                               var isActive = (L.env.requestpath.length ? children[i].name == L.env.requestpath[0] : i == 0);
+
+                               ul.appendChild(E('li', {}, [
+                                       E('a', {
+                                               'href': L.url(children[i].name),
+                                               'class': isActive ? 'active' : null
+                                       }, [ _(children[i].title) ])
+                               ]));
+
+                               if (isActive)
+                                       render_mainmenu(children[i], children[i].name);
+                       }
+
+                       if (ul.children.length > 1)
+                               ul.style.display = '';
+               }
+
+               function render_tabmenu(tree, url, level) {
+                       var container = document.querySelector('#tabmenu'),
+                           l = (level || 0) + 1,
+                           ul = E('ul', { 'class': 'cbi-tabmenu' }),
+                           children = get_children(tree),
+                           activeNode = null;
+
+                       if (children.length == 0)
+                               return E([]);
+
+                       for (var i = 0; i < children.length; i++) {
+                               var isActive = (L.env.dispatchpath[l + 2] == children[i].name),
+                                   activeClass = isActive ? ' cbi-tab' : '',
+                                   className = 'tabmenu-item-%s %s'.format(children[i].name, activeClass);
+
+                               ul.appendChild(E('li', { 'class': className }, [
+                                       E('a', { 'href': L.url(url, children[i].name) }, [ _(children[i].title) ] )
+                               ]));
+
+                               if (isActive)
+                                       activeNode = children[i];
+                       }
+
+                       container.appendChild(ul);
+                       container.style.display = '';
+
+                       if (activeNode)
+                               container.appendChild(render_tabmenu(activeNode, url + '/' + activeNode.name, l));
+
+                       return ul;
+               }
+
+               document.addEventListener('luci-loaded', function(ev) {
+                       var tree = <%= luci.http.write_json(luci.dispatcher.context.authsession and luci.dispatcher.menu_json() or {}) %>,
+                           node = tree,
+                           url = '';
+
+                       render_modemenu(tree);
+
+                       if (L.env.dispatchpath.length >= 3) {
+                               for (var i = 0; i < 3 && node; i++) {
+                                       node = node.children[L.env.dispatchpath[i]];
+                                       url = url + (url ? '/' : '') + L.env.dispatchpath[i];
+                               }
+
+                               if (node)
+                                       render_tabmenu(node, url);
+                       }
                });
-       });
+       })();
 //]]></script>
 <title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
 </head>
@@ -207,24 +208,16 @@
        </span>
 </div>
 
-<% if #categories > 1 then %>
-       <ul id="modemenu">
-               <% for i, r in ipairs(categories) do %>
-                       <li><a<% if request[1] == r then %> class="active"<%end%> href="<%=controller%>/<%=r%>/"><%=striptags(translate(tree.nodes[r].title))%></a></li>
-               <% end %>
-       </ul>
-<% end %>
+<ul id="modemenu" style="display:none"></ul>
 
 <div class="clear"></div>
 </div>
 
 <div id="maincontainer">
-       <div id="mainmenu">
-               <% if category then render_menu(category, cattree) end %>
-       </div>
+       <div id="mainmenu" style="display:none"></div>
 
        <div id="maincontent">
-               <% if category then render_tabmenu(category, cattree) end %>
+               <div id="tabmenu" style="display:none"></div>
 
                <noscript>
                        <div class="alert-message warning">

diff --git a/themes/luci-theme-rosy/Makefile b/themes/luci-theme-rosy/Makefile
index def973da74d87f9154ba3d88c228235414cca39a..a6e9f99ca9106c90667310ab6a061d12f4f0fc59 100755 (executable)
--- a/themes/luci-theme-rosy/Makefile
+++ b/themes/luci-theme-rosy/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Rosy Theme
-LUCI_DEPENDS:=
+LUCI_DEPENDS:=@BROKEN
 
 include ../../luci.mk
 

diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
index fca731cadd393905e0c6cb52313ab4c38b2fbf92..d74c86d22fa242952a18457c6b30d04f4b21f311 100644 (file)
--- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
+++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
@@ -1389,7 +1389,6 @@ form[method="post"] + form[method="post"],
        min-width: 270px;
        max-width: 600px;
        min-height: 80px;
-       max-height: 2400px;
        margin: 5em auto;
        padding: 1em;
        border-radius: 20px !important;